From 2a27c94b1a840a02c552829fddf7b7d3f434f994 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 15 Sep 2016 15:35:44 +0200
Subject: [PATCH] When selecting a mip in a 3D texture, update slice list. Refs
 #359

* The sliceFace passed in via the replay interface is still in 0-n range
  with n being the top level mip dimension. We just change the drop-down
  so that it only lists the number of slices at that mip, and scales up
  accordingly.
---
 renderdocui/Windows/TextureViewer.cs | 33 +++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs
index d239766f2..a81e397a7 100644
--- a/renderdocui/Windows/TextureViewer.cs
+++ b/renderdocui/Windows/TextureViewer.cs
@@ -1654,7 +1654,6 @@ namespace renderdocui.Windows
             UI_UpdateStatusText();
 
             mipLevel.Items.Clear();
-            sliceFace.Items.Clear();
 
             m_TexDisplay.mip = 0;
             m_TexDisplay.sliceFace = 0;
@@ -1719,6 +1718,8 @@ namespace renderdocui.Windows
                 mipLevel.Enabled = true;
             }
 
+            sliceFace.Items.Clear();
+
             if (tex.numSubresources == tex.mips && tex.depth <= 1)
             {
                 sliceFace.Enabled = false;
@@ -1733,6 +1734,10 @@ namespace renderdocui.Windows
 
                 UInt32 numSlices = (Math.Max(1, tex.depth) * tex.numSubresources) / tex.mips;
 
+                // for 3D textures, display the number of slices at this mip
+                if(tex.depth > 1)
+                    numSlices = Math.Max(1, tex.depth >> (int)mipLevel.SelectedIndex);
+
                 for (UInt32 i = 0; i < numSlices; i++)
                 {
                     if (tex.cubemap)
@@ -3138,6 +3143,8 @@ namespace renderdocui.Windows
         {
             if (CurrentTexture == null) return;
 
+            uint prevSlice = m_TexDisplay.sliceFace;
+
             if (CurrentTexture.mips > 1)
             {
                 m_TexDisplay.mip = (UInt32)mipLevel.SelectedIndex;
@@ -3151,6 +3158,24 @@ namespace renderdocui.Windows
                     m_TexDisplay.sampleIdx = ~0U;
             }
 
+            // For 3D textures, update the slice list for this mip
+            if(CurrentTexture.depth > 1)
+            {
+                uint newSlice = prevSlice >> (int)m_TexDisplay.mip;
+
+                UInt32 numSlices = Math.Max(1, CurrentTexture.depth >> (int)m_TexDisplay.mip);
+
+                sliceFace.Items.Clear();
+
+                for (UInt32 i = 0; i < numSlices; i++)
+                    sliceFace.Items.Add("Slice " + i);
+
+                // changing sliceFace index will handle updating range & re-picking
+                sliceFace.SelectedIndex = Helpers.Clamp((int)newSlice, 0, sliceFace.Items.Count-1);
+
+                return;
+            }
+
             m_Core.Renderer.BeginInvoke(RT_UpdateVisualRange);
 
             if (m_Output != null && m_PickedPoint.X >= 0 && m_PickedPoint.Y >= 0)
@@ -3179,6 +3204,9 @@ namespace renderdocui.Windows
         {
             m_TexDisplay.sliceFace = (UInt32)sliceFace.SelectedIndex;
 
+            if (CurrentTexture.depth > 1)
+                m_TexDisplay.sliceFace = (UInt32)(sliceFace.SelectedIndex << (int)m_TexDisplay.mip);
+
             m_Core.Renderer.BeginInvoke(RT_UpdateVisualRange);
 
             if (m_Output != null && m_PickedPoint.X >= 0 && m_PickedPoint.Y >= 0)
@@ -3617,6 +3645,9 @@ namespace renderdocui.Windows
             m_SaveDialog.saveData.slice.sliceIndex = (int)m_TexDisplay.sliceFace;
             m_SaveDialog.saveData.mip = (int)m_TexDisplay.mip;
 
+            if(CurrentTexture != null && CurrentTexture.depth > 1)
+                m_SaveDialog.saveData.slice.sliceIndex = (int)m_TexDisplay.sliceFace >> (int)m_TexDisplay.mip;
+
             m_SaveDialog.saveData.channelExtract = -1;
             if (m_TexDisplay.Red && !m_TexDisplay.Green && !m_TexDisplay.Blue && !m_TexDisplay.Alpha)
                 m_SaveDialog.saveData.channelExtract = 0;