From 17970efc48a4a606337361f32bfb6224b72c8987 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 7 Sep 2016 13:52:28 +1200 Subject: layers: Make CmdEndRenderPass more careful about side effects on failure Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index e5048e89..5d3e1609 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -10127,14 +10127,21 @@ VKAPI_ATTR void VKAPI_CALL CmdEndRenderPass(VkCommandBuffer commandBuffer) { skip_call |= outsideRenderPass(dev_data, pCB, "vkCmdEndRenderpass"); skip_call |= validatePrimaryCommandBuffer(dev_data, pCB, "vkCmdEndRenderPass"); skip_call |= addCmd(dev_data, pCB, CMD_ENDRENDERPASS, "vkCmdEndRenderPass()"); + } + lock.unlock(); + + if (skip_call) + return; + + dev_data->device_dispatch_table->CmdEndRenderPass(commandBuffer); + + if (pCB) { + lock.lock(); TransitionFinalSubpassLayouts(dev_data, pCB, &pCB->activeRenderPassBeginInfo); pCB->activeRenderPass = nullptr; pCB->activeSubpass = 0; pCB->activeFramebuffer = VK_NULL_HANDLE; } - lock.unlock(); - if (!skip_call) - dev_data->device_dispatch_table->CmdEndRenderPass(commandBuffer); } static bool logInvalidAttachmentMessage(layer_data *dev_data, VkCommandBuffer secondaryBuffer, uint32_t primaryAttach, -- cgit v1.2.3