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

Protect against framebuffer being unset when not in valid pipeline state

Browse Source
This commit is contained in:
baldurk
2015-10-06 21:48:58 +02:00
parent 495632034f
commit 448df65773
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Code/CommonPipelineState.cs
+29 -7
View File
@@ -851,13 +851,22 @@ namespace renderdocui.Code
if (LogLoaded)
{
if (IsLogD3D11)
{
return m_D3D11.m_OM.DepthTarget.Resource;
}
else if (IsLogGL)
{
return m_GL.m_FB.m_DrawFBO.Depth.Obj;
}
else if (IsLogVK)
return m_Vulkan.Pass.renderpass.depthstencilAttachment >= 0
? m_Vulkan.Pass.framebuffer.attachments[m_Vulkan.Pass.renderpass.depthstencilAttachment].img
{
var rp = m_Vulkan.Pass.renderpass;
var fb = m_Vulkan.Pass.framebuffer;
return rp.depthstencilAttachment >= 0 && rp.depthstencilAttachment < fb.attachments.Length
? fb.attachments[rp.depthstencilAttachment].img
: ResourceId.Null;
}
}
return ResourceId.Null;
@@ -868,13 +877,22 @@ namespace renderdocui.Code
if (LogLoaded)
{
if (IsLogD3D11)
{
return m_D3D11.m_OM.DepthTarget.Resource;
}
else if (IsLogGL)
{
return m_GL.m_FB.m_DrawFBO.Stencil.Obj;
}
else if (IsLogVK)
return m_Vulkan.Pass.renderpass.depthstencilAttachment >= 0
? m_Vulkan.Pass.framebuffer.attachments[m_Vulkan.Pass.renderpass.depthstencilAttachment].img
{
var rp = m_Vulkan.Pass.renderpass;
var fb = m_Vulkan.Pass.framebuffer;
return rp.depthstencilAttachment >= 0 && rp.depthstencilAttachment < fb.attachments.Length
? fb.attachments[rp.depthstencilAttachment].img
: ResourceId.Null;
}
}
return ResourceId.Null;
@@ -906,9 +924,13 @@ namespace renderdocui.Code
}
else if (IsLogVK)
{
ResourceId[] ret = new ResourceId[m_Vulkan.Pass.renderpass.colorAttachments.Length];
for (int i = 0; i < m_Vulkan.Pass.renderpass.colorAttachments.Length; i++)
ret[i] = m_Vulkan.Pass.framebuffer.attachments[m_Vulkan.Pass.renderpass.colorAttachments[i]].img;
var rp = m_Vulkan.Pass.renderpass;
var fb = m_Vulkan.Pass.framebuffer;
ResourceId[] ret = new ResourceId[rp.colorAttachments.Length];
for (int i = 0; i < rp.colorAttachments.Length; i++)
ret[i] = rp.colorAttachments[i] < fb.attachments.Length
? fb.attachments[rp.colorAttachments[i]].img
: ResourceId.Null;
return ret;
}