From 3bdfd1ecd6d2c9be2a1fa37e899b34270a8cf9fd Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 22 Feb 2018 19:48:30 +0000
Subject: [PATCH] Set the current highest mip/first array slice after
 unblocking signals

---
 qrenderdoc/Windows/TextureViewer.cpp | 90 +++++++++++++++-------------
 1 file changed, 48 insertions(+), 42 deletions(-)

diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 6858e361d..8220becaf 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -1190,7 +1190,55 @@ void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw)
           QFormatStr("%1 - %2x%3").arg(i).arg(qMax(1U, tex.width >> i)).arg(qMax(1U, tex.height >> i)));
 
     ui->mipLabel->setText(tr("Mip"));
+  }
 
+  if(tex.mips == 1 && tex.msSamp <= 1)
+    ui->mipLevel->setEnabled(false);
+  else
+    ui->mipLevel->setEnabled(true);
+
+  ui->sliceFace->clear();
+
+  uint32_t numSlices = 1;
+
+  if(tex.arraysize == 1 && tex.depth <= 1)
+  {
+    ui->sliceFace->setEnabled(false);
+  }
+  else
+  {
+    ui->sliceFace->setEnabled(true);
+
+    QString cubeFaces[] = {lit("X+"), lit("X-"), lit("Y+"), lit("Y-"), lit("Z+"), lit("Z-")};
+
+    numSlices = tex.arraysize;
+
+    // for 3D textures, display the number of slices at this mip
+    if(tex.depth > 1)
+      numSlices = qMax(1u, tex.depth >> (int)ui->mipLevel->currentIndex());
+
+    for(uint32_t i = 0; i < numSlices; i++)
+    {
+      if(tex.cubemap)
+      {
+        QString name = cubeFaces[i % 6];
+        if(numSlices > 6)
+          name = QFormatStr("[%1] %2").arg(i / 6).arg(
+              cubeFaces[i % 6]);    // Front 1, Back 2, 3, 4 etc for cube arrays
+        ui->sliceFace->addItem(name);
+      }
+      else
+      {
+        ui->sliceFace->addItem(tr("Slice %1").arg(i));
+      }
+    }
+  }
+
+  // enable signals for mipLevel and sliceFace
+  ui->mipLevel->blockSignals(false);
+  ui->sliceFace->blockSignals(false);
+
+  {
     int highestMip = -1;
 
     // only switch to the selected mip for outputs, and when changing drawcall
@@ -1215,45 +1263,7 @@ void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw)
     m_PrevHighestMip = highestMip;
   }
 
-  if(tex.mips == 1 && tex.msSamp <= 1)
-    ui->mipLevel->setEnabled(false);
-  else
-    ui->mipLevel->setEnabled(true);
-
-  ui->sliceFace->clear();
-
-  if(tex.arraysize == 1 && tex.depth <= 1)
   {
-    ui->sliceFace->setEnabled(false);
-  }
-  else
-  {
-    ui->sliceFace->setEnabled(true);
-
-    QString cubeFaces[] = {lit("X+"), lit("X-"), lit("Y+"), lit("Y-"), lit("Z+"), lit("Z-")};
-
-    uint32_t numSlices = tex.arraysize;
-
-    // for 3D textures, display the number of slices at this mip
-    if(tex.depth > 1)
-      numSlices = qMax(1u, tex.depth >> (int)ui->mipLevel->currentIndex());
-
-    for(uint32_t i = 0; i < numSlices; i++)
-    {
-      if(tex.cubemap)
-      {
-        QString name = cubeFaces[i % 6];
-        if(numSlices > 6)
-          name = QFormatStr("[%1] %2").arg(i / 6).arg(
-              cubeFaces[i % 6]);    // Front 1, Back 2, 3, 4 etc for cube arrays
-        ui->sliceFace->addItem(name);
-      }
-      else
-      {
-        ui->sliceFace->addItem(tr("Slice %1").arg(i));
-      }
-    }
-
     int firstArraySlice = -1;
     // only switch to the selected mip for outputs, and when changing drawcall
     if(!currentTextureIsLocked() && m_Following.Type != FollowType::ReadOnly && newdraw)
@@ -1272,10 +1282,6 @@ void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw)
     m_PrevFirstArraySlice = firstArraySlice;
   }
 
-  // enable signals for mipLevel and sliceFace
-  ui->mipLevel->blockSignals(false);
-  ui->sliceFace->blockSignals(false);
-
   // because slice and mip are specially set above, we restore any per-tex settings to apply
   // even if we don't switch to a new texture.
   // Note that if the slice or mip was changed because that slice or mip is the selected one