From c30fd3e1e10049e132364927b1e5489e96f69a1c Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 12 Mar 2015 00:39:47 +0000 Subject: [PATCH] Fix a crash if constant buffer is still open when log is closed --- renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs index 2ea25808f..fb91a6eac 100644 --- a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs +++ b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs @@ -211,9 +211,13 @@ namespace renderdocui.Controls { get { + APIPipelineStateType pipeType = APIPipelineStateType.D3D11; + if (m_Core != null && m_Core.APIProps != null) + pipeType = m_Core.APIProps.pipelineType; + return String.Format("{0} {1} {2}", - Stage.Str(m_Core != null ? m_Core.APIProps.pipelineType : APIPipelineStateType.D3D11), - m_Core == null || m_Core.APIProps.pipelineType == APIPipelineStateType.D3D11 ? "CB" : "UBO", + Stage.Str(pipeType), + pipeType == APIPipelineStateType.D3D11 ? "CB" : "UBO", Slot); } }