From 59bc8254bd68416fa395db6b855077cb9772ae27 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 5 Aug 2016 12:54:13 +0200 Subject: [PATCH] Fix potential crash if drawcall is null when showing empty ibuffer --- renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs | 4 ++-- .../Windows/PipelineState/VulkanPipelineStateViewer.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs index a611c2d9b..f20008958 100644 --- a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs +++ b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs @@ -959,7 +959,7 @@ namespace renderdocui.Windows.PipelineState node.Image = global::renderdocui.Properties.Resources.action; node.HoverImage = global::renderdocui.Properties.Resources.action_hover; - node.Tag = new IABufferTag(state.m_IA.ibuffer.Buffer, draw.indexOffset); + node.Tag = new IABufferTag(state.m_IA.ibuffer.Buffer, draw != null ? draw.indexOffset : 0); if (!ibufferUsed) InactiveRow(node); @@ -976,7 +976,7 @@ namespace renderdocui.Windows.PipelineState node.Image = global::renderdocui.Properties.Resources.action; node.HoverImage = global::renderdocui.Properties.Resources.action_hover; - node.Tag = new IABufferTag(state.m_IA.ibuffer.Buffer, draw.indexOffset); + node.Tag = new IABufferTag(state.m_IA.ibuffer.Buffer, draw != null ? draw.indexOffset : 0); EmptyRow(node); diff --git a/renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs b/renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs index 8eb1956c4..1995626f5 100644 --- a/renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs +++ b/renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs @@ -1326,7 +1326,7 @@ namespace renderdocui.Windows.PipelineState node.Image = global::renderdocui.Properties.Resources.action; node.HoverImage = global::renderdocui.Properties.Resources.action_hover; - node.Tag = new IABufferTag(state.IA.ibuffer.buf, draw.indexOffset); + node.Tag = new IABufferTag(state.IA.ibuffer.buf, draw != null ? draw.indexOffset : 0); if (!ibufferUsed) InactiveRow(node); @@ -1343,7 +1343,7 @@ namespace renderdocui.Windows.PipelineState node.Image = global::renderdocui.Properties.Resources.action; node.HoverImage = global::renderdocui.Properties.Resources.action_hover; - node.Tag = new IABufferTag(state.IA.ibuffer.buf, draw.indexOffset); + node.Tag = new IABufferTag(state.IA.ibuffer.buf, draw != null ? draw.indexOffset : 0); EmptyRow(node);