From 119ff004408587b386f7c792b2f73b20c3edd7d8 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 21 Oct 2016 20:50:24 +0200 Subject: [PATCH] Don't get cbuffer in constructor, do that in OnLogFileLoaded when shown --- .../Windows/Dialogs/ConstantBufferPreviewer.cs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs index 4e65b302f..8dfc8ffda 100644 --- a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs +++ b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs @@ -58,18 +58,6 @@ namespace renderdocui.Controls shader = m_Core.CurPipelineState.GetShader(stage); entryPoint = m_Core.CurPipelineState.GetShaderEntryPoint(stage); UpdateLabels(); - - ulong offs = 0; - ulong size = 0; - m_Core.CurPipelineState.GetConstantBuffer(Stage, Slot, ArrayIdx, out cbuffer, out offs, out size); - - m_Core.Renderer.BeginInvoke((ReplayRenderer r) => - { - var vars = r.GetCBufferVariableContents(shader, entryPoint, Slot, cbuffer, offs); - this.BeginInvoke(new Action(() => { SetVariables(vars); })); - }); - - m_Core.AddLogViewer(this); } private static List m_Docks = new List(); @@ -87,6 +75,7 @@ namespace renderdocui.Controls public void ShowDock(DockPane pane, DockAlignment align, double proportion) { + Shown += ConstantBufferPreviewer_Shown; FormClosed += new FormClosedEventHandler(dock_FormClosed); if (m_Docks.Count > 0) @@ -97,6 +86,11 @@ namespace renderdocui.Controls m_Docks.Add(this); } + private void ConstantBufferPreviewer_Shown(object sender, EventArgs e) + { + m_Core.AddLogViewer(this); + } + static void dock_FormClosed(object sender, FormClosedEventArgs e) { ConstantBufferPreviewer cbp = sender as ConstantBufferPreviewer;