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

Don't override user selected mip or slice for RO textures, or same draw

Browse Source 
* This means we only jump to the 'active' mip or slice when switching to
  a new draw with some texture on output. This still lets us
  automatically follow through a mip generation chain or cubemap
  rendering, but when looking at a particular slice or mip on a texture
  it doesn't get reset when switching textures around.
This commit is contained in:
baldurk
2016-09-15 13:46:56 +02:00
parent c909c4e5b0
commit 4377297544
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Windows/TextureViewer.cs
+9 -6
View File
@@ -1407,7 +1407,7 @@ namespace renderdocui.Windows
if (IsDisposed) return;
if (!CurrentTextureIsLocked || (CurrentTexture != null && m_TexDisplay.texid != CurrentTexture.ID))
UI_OnTextureSelectionChanged();
UI_OnTextureSelectionChanged(true);
if (m_Output == null) return;
@@ -1561,7 +1561,7 @@ namespace renderdocui.Windows
rangeHistogram.SetRange(0.0f, 1.0f);
}
private void UI_OnTextureSelectionChanged()
private void UI_OnTextureSelectionChanged(bool newdraw)
{
FetchTexture tex = CurrentTexture;
@@ -1687,7 +1687,9 @@ namespace renderdocui.Windows
mipLevelLabel.Text = "Mip";
int highestMip = -1;
if (!CurrentTextureIsLocked)
// only switch to the selected mip for outputs, and when changing drawcall
if (!CurrentTextureIsLocked && m_Following.Type != FollowType.ReadOnly && newdraw)
highestMip = m_Following.GetHighestMip(m_Core);
// assuming we get a valid mip for the highest mip, only switch to it
@@ -1747,7 +1749,8 @@ namespace renderdocui.Windows
}
int firstArraySlice = -1;
if (!CurrentTextureIsLocked)
// only switch to the selected mip for outputs, and when changing drawcall
if (!CurrentTextureIsLocked && m_Following.Type != FollowType.ReadOnly && newdraw)
firstArraySlice = m_Following.GetFirstArraySlice(m_Core);
// see above with highestMip and prevHighestMip for the logic behind this
@@ -1874,7 +1877,7 @@ namespace renderdocui.Windows
if (d.Visible)
d.Controls.Add(renderToolstripContainer);
UI_OnTextureSelectionChanged();
UI_OnTextureSelectionChanged(false);
}
void PreviewPanel_FormClosing(object sender, FormClosingEventArgs e)
@@ -3886,7 +3889,7 @@ namespace renderdocui.Windows
if (id != ResourceId.Null)
{
UI_OnTextureSelectionChanged();
UI_OnTextureSelectionChanged(false);
m_PreviewPanel.Show();
}
}