lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make handling of mips more consistent around locked textures. Refs #292

Browse Source
This commit is contained in:
baldurk
2016-07-12 19:22:17 +02:00
parent 2a68153def
commit 2b5e37b442
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Windows/TextureViewer.cs
+27 -5
View File
@@ -1292,7 +1292,8 @@ namespace renderdocui.Windows
{
if (IsDisposed) return;
UI_OnTextureSelectionChanged();
if (!CurrentTextureIsLocked || (CurrentTexture != null && m_TexDisplay.texid != CurrentTexture.ID))
UI_OnTextureSelectionChanged();
UI_CreateThumbnails();
@@ -1483,7 +1484,8 @@ namespace renderdocui.Windows
m_TexDisplay.texid = tex.ID;
// interpret the texture according to the currently following type.
m_TexDisplay.typeHint = m_Following.GetTypeHint(m_Core);
if(!CurrentTextureIsLocked)
m_TexDisplay.typeHint = m_Following.GetTypeHint(m_Core);
// if there is no such type or it isn't being followed, use the last seen interpretation
if (m_TexDisplay.typeHint == FormatComponentType.None && m_TextureSettings.ContainsKey(m_TexDisplay.texid))
@@ -1568,7 +1570,10 @@ namespace renderdocui.Windows
mipLevelLabel.Text = "Mip";
int highestMip = m_Following.GetHighestMip(m_Core);
int highestMip = -1;
if (!CurrentTextureIsLocked)
highestMip = m_Following.GetHighestMip(m_Core);
// assuming we get a valid mip for the highest mip, only switch to it
// if we've selected a new texture, or if it's different than the last mip.
// This prevents the case where the user has clicked on another mip and
@@ -1582,7 +1587,7 @@ namespace renderdocui.Windows
}
if (mipLevel.SelectedIndex == -1)
mipLevel.SelectedIndex = 0;
mipLevel.SelectedIndex = prevHighestMip;
prevHighestMip = highestMip;
}
@@ -1625,7 +1630,10 @@ namespace renderdocui.Windows
}
}
int firstArraySlice = m_Following.GetFirstArraySlice(m_Core);
int firstArraySlice = -1;
if (!CurrentTextureIsLocked)
firstArraySlice = m_Following.GetFirstArraySlice(m_Core);
// see above with highestMip and prevHighestMip for the logic behind this
if (firstArraySlice >= 0 && (newtex || firstArraySlice != prevFirstArraySlice))
{
@@ -1633,6 +1641,9 @@ namespace renderdocui.Windows
sliceFace.SelectedIndex = Helpers.Clamp(firstArraySlice, 0, (int)numSlices - 1);
}
if (sliceFace.SelectedIndex == -1)
sliceFace.SelectedIndex = prevFirstArraySlice;
prevFirstArraySlice = firstArraySlice;
}
@@ -2341,6 +2352,17 @@ namespace renderdocui.Windows
return null;
}
}
private bool CurrentTextureIsLocked
{
get
{
var dc = renderToolstripContainer.Parent as DockContent;
return (dc != null && dc.Tag != null);
}
}
private FetchTexture CurrentTexture
{
get