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

Always call SetVariables from UI thread, don't use InvokeRequired

Browse Source
This commit is contained in:
baldurk
2016-10-19 12:21:50 +02:00
parent 8856d3a6f2
commit cc35215a12
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
+18 -21
View File
@@ -65,7 +65,8 @@ namespace renderdocui.Controls
m_Core.Renderer.BeginInvoke((ReplayRenderer r) =>
{
SetVariables(r.GetCBufferVariableContents(shader, entryPoint, Slot, cbuffer, offs));
var vars = r.GetCBufferVariableContents(shader, entryPoint, Slot, cbuffer, offs);
this.BeginInvoke(new Action(() => { SetVariables(vars); }));
});
m_Core.AddLogViewer(this);
@@ -161,12 +162,6 @@ namespace renderdocui.Controls
private void SetVariables(ShaderVariable[] vars)
{
if (this.InvokeRequired || variables.InvokeRequired)
{
this.BeginInvoke(new Action(() => { SetVariables(vars); }));
return;
}
variables.BeginUpdate();
variables.Nodes.Clear();
@@ -200,20 +195,22 @@ namespace renderdocui.Controls
return;
}
if (m_FormatOverride != null)
{
m_Core.Renderer.BeginInvoke((ReplayRenderer r) =>
{
SetVariables(ApplyFormatOverride(r.GetBufferData(cbuffer, offs, size)));
});
}
else
{
m_Core.Renderer.BeginInvoke((ReplayRenderer r) =>
{
SetVariables(r.GetCBufferVariableContents(shader, entryPoint, Slot, cbuffer, offs));
});
}
if (m_FormatOverride != null)
{
m_Core.Renderer.BeginInvoke((ReplayRenderer r) =>
{
var vars = ApplyFormatOverride(r.GetBufferData(cbuffer, offs, size));
this.BeginInvoke(new Action(() => { SetVariables(vars); }));
});
}
else
{
m_Core.Renderer.BeginInvoke((ReplayRenderer r) =>
{
var vars = r.GetCBufferVariableContents(shader, entryPoint, Slot, cbuffer, offs);
this.BeginInvoke(new Action(() => { SetVariables(vars); }));
});
}
}
private string BufferName = "";