From ac7e8ff800a9eb1583889841874358839ee61611 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 24 Apr 2017 19:00:42 +0100
Subject: [PATCH] Fix texture display broken by d22d744675d

---
 renderdoc/driver/gl/gl_debug.cpp                 |  7 +++++--
 renderdoc/driver/gl/gl_driver.h                  |  3 +--
 .../driver/gl/wrappers/gl_interop_funcs.cpp      | 16 ++++++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp
index 461f2b9a0..4780e190d 100644
--- a/renderdoc/driver/gl/gl_debug.cpp
+++ b/renderdoc/driver/gl/gl_debug.cpp
@@ -1819,6 +1819,9 @@ bool GLReplay::RenderTextureInternal(TextureDisplay cfg, int flags)
   gl.glUseProgramStages(DebugData.texDisplayPipe, eGL_FRAGMENT_SHADER_BIT,
                         DebugData.texDisplayProg[intIdx]);
 
+  int numMips =
+      GetNumMips(gl.m_Real, target, texname, texDetails.width, texDetails.height, texDetails.depth);
+
   if(cfg.CustomShader != ResourceId() && gl.GetResourceManager()->HasCurrentResource(cfg.CustomShader))
   {
     GLuint customProg = gl.GetResourceManager()->GetCurrentResource(cfg.CustomShader).name;
@@ -1829,7 +1832,7 @@ bool GLReplay::RenderTextureInternal(TextureDisplay cfg, int flags)
     loc = gl.glGetUniformLocation(customProg, "RENDERDOC_TexDim");
     if(loc >= 0)
       gl.glProgramUniform4ui(customProg, loc, texDetails.width, texDetails.height, texDetails.depth,
-                             texDetails.mips);
+                             (uint32_t)numMips);
 
     loc = gl.glGetUniformLocation(customProg, "RENDERDOC_SelectedMip");
     if(loc >= 0)
@@ -1871,7 +1874,7 @@ bool GLReplay::RenderTextureInternal(TextureDisplay cfg, int flags)
   GLint clampmaxlevel[4] = {};
 
   if(cfg.texid != DebugData.CustomShaderTexID)
-    clampmaxlevel[0] = GLint(texDetails.mips - 1);
+    clampmaxlevel[0] = GLint(numMips - 1);
 
   gl.glGetTextureParameterivEXT(texname, target, eGL_TEXTURE_MAX_LEVEL, maxlevel);
 
diff --git a/renderdoc/driver/gl/gl_driver.h b/renderdoc/driver/gl/gl_driver.h
index 5dd89cc1e..1956883a3 100644
--- a/renderdoc/driver/gl/gl_driver.h
+++ b/renderdoc/driver/gl/gl_driver.h
@@ -264,7 +264,6 @@ private:
           height(0),
           depth(0),
           samples(0),
-          mips(1),
           creationFlags(TextureCategory::NoFlags),
           internalFormat(eGL_NONE),
           renderbufferReadTex(0)
@@ -275,7 +274,7 @@ private:
     GLenum curType;
     GLint dimension;
     bool emulated, view;
-    GLint width, height, depth, samples, mips;
+    GLint width, height, depth, samples;
     TextureCategory creationFlags;
     GLenum internalFormat;
 
diff --git a/renderdoc/driver/gl/wrappers/gl_interop_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_interop_funcs.cpp
index fa69cacf1..7cf3dd091 100644
--- a/renderdoc/driver/gl/wrappers/gl_interop_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_interop_funcs.cpp
@@ -108,6 +108,12 @@ HANDLE WrappedOpenGL::wglDXRegisterObjectNV(HANDLE hDevice, void *dxObject, GLui
     uint32_t width = 0, height = 0, depth = 0, mips = 0, layers = 0, samples = 0;
     GetDXTextureProperties(dxObject, fmt, width, height, depth, mips, layers, samples);
 
+    // defined as arrays mostly for Coverity code analysis to stay calm about passing
+    // them to the *TexParameter* functions
+    GLint maxlevel[4] = {GLint(mips - 1), 0, 0, 0};
+
+    m_Real.glTextureParameteriEXT(wrapped->res.name, type, eGL_TEXTURE_MAX_LEVEL, GLint(mips - 1));
+
     ResourceId texId = record->GetResourceID();
     m_Textures[texId].resource = wrapped->res;
     m_Textures[texId].curType = type;
@@ -115,7 +121,6 @@ HANDLE WrappedOpenGL::wglDXRegisterObjectNV(HANDLE hDevice, void *dxObject, GLui
     m_Textures[texId].height = height;
     m_Textures[texId].depth = RDCMAX(depth, samples);
     m_Textures[texId].samples = samples;
-    m_Textures[texId].mips = mips;
     m_Textures[texId].dimension = 2;
     if(type == eGL_TEXTURE_1D || type == eGL_TEXTURE_1D_ARRAY)
       m_Textures[texId].dimension = 1;
@@ -311,7 +316,6 @@ bool WrappedOpenGL::Serialise_wglDXRegisterObjectNV(GLResource res, GLenum type,
     m_Textures[liveId].height = height;
     m_Textures[liveId].depth = RDCMAX(depth, samples);
     m_Textures[liveId].samples = samples;
-    m_Textures[liveId].mips = mips;
     m_Textures[liveId].dimension = 2;
     if(type == eGL_TEXTURE_1D || type == eGL_TEXTURE_1D_ARRAY)
       m_Textures[liveId].dimension = 1;
@@ -366,7 +370,9 @@ bool WrappedOpenGL::Serialise_wglDXLockObjectsNV(GLResource res)
 
       gl.glBindTexture(textype, tex);
 
-      for(int i = 0; i < details.mips; i++)
+      int mips = GetNumMips(gl, textype, tex, details.width, details.height, details.depth);
+
+      for(int i = 0; i < mips; i++)
       {
         int w = RDCMAX(details.width >> i, 1);
         int h = RDCMAX(details.height >> i, 1);
@@ -430,7 +436,9 @@ bool WrappedOpenGL::Serialise_wglDXLockObjectsNV(GLResource res)
 
       GLint dim = details.dimension;
 
-      for(int i = 0; i < details.mips; i++)
+      int mips = GetNumMips(m_Real, textype, tex, details.width, details.height, details.depth);
+
+      for(int i = 0; i < mips; i++)
       {
         uint32_t w = RDCMAX(details.width >> i, 1);
         uint32_t h = RDCMAX(details.height >> i, 1);