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

Handle invalid pointers in create info when viewport state is dynamic

Browse Source
This commit is contained in:
baldurk
2020-04-15 10:33:57 +01:00
parent 772905c4d3
commit f4e141e843
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_serialise.cpp
+29 -1
View File
@@ -2758,7 +2758,35 @@ void DoSerialise(SerialiserType &ser, VkGraphicsPipelineCreateInfo &el)
if(hasValidRasterization)
{
SERIALISE_MEMBER_OPT(pViewportState);
// we have a similar problem with needing pDynamicState to determine if the pViewports/pScissors
// members are valid or not.
if(ser.IsReading() || el.pViewportState == NULL)
{
// all the hard work is done while writing. On reading, just serialise (optionally) directly.
SERIALISE_MEMBER_OPT(pViewportState);
}
else
{
bool dynamicViewport = false, dynamicScissor = false;
for(uint32_t i = 0; el.pDynamicState && i < el.pDynamicState->dynamicStateCount; i++)
{
if(el.pDynamicState->pDynamicStates[i] == VK_DYNAMIC_STATE_VIEWPORT)
dynamicViewport = true;
else if(el.pDynamicState->pDynamicStates[i] == VK_DYNAMIC_STATE_SCISSOR)
dynamicScissor = true;
}
VkPipelineViewportStateCreateInfo viewportState = *el.pViewportState;
VkPipelineViewportStateCreateInfo *pViewportState = &viewportState;
if(dynamicScissor)
viewportState.pScissors = NULL;
if(dynamicViewport)
viewportState.pViewports = NULL;
SERIALISE_ELEMENT_OPT(pViewportState);
}
}
else
{
util/test/demos/vk/vk_parameter_zoo.cpp
+13
View File
@@ -427,6 +427,19 @@ void main()
CHECK_VKR(vkCreateGraphicsPipelines(device, VK_NULL_HANDLE, 1, baked, NULL, &dummy));
vkDestroyPipeline(device, dummy, NULL);
VkPipelineViewportStateCreateInfo *viewState =
(VkPipelineViewportStateCreateInfo *)&pipeCreateInfo.viewportState;
baked->pViewportState = viewState;
// viewport and scissor are already dynamic, so just set viewports and scissors to invalid
// pointers
viewState->pViewports = (VkViewport *)0x1234;
viewState->pScissors = (VkRect2D *)0x1234;
CHECK_VKR(vkCreateGraphicsPipelines(device, VK_NULL_HANDLE, 1, baked, NULL, &dummy));
vkDestroyPipeline(device, dummy, NULL);
// if we disable rasterization, tons of things can be NULL/garbage
pipeCreateInfo.rasterizationState.rasterizerDiscardEnable = VK_TRUE;