From 1ba3bf459e699206d13e40697dcb1df93e0b9fd2 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 7 Sep 2016 11:44:08 +1200 Subject: layers: add error to CmdNextSubpass if stepping beyond last subpass Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index df2c6c92..e5048e89 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -10070,6 +10070,14 @@ VKAPI_ATTR void VKAPI_CALL CmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpa skip_call |= validatePrimaryCommandBuffer(dev_data, pCB, "vkCmdNextSubpass"); skip_call |= addCmd(dev_data, pCB, CMD_NEXTSUBPASS, "vkCmdNextSubpass()"); skip_call |= outsideRenderPass(dev_data, pCB, "vkCmdNextSubpass"); + + auto subpassCount = pCB->activeRenderPass->pCreateInfo->subpassCount; + if (pCB->activeSubpass == subpassCount - 1) { + skip_call |= + log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, + reinterpret_cast(commandBuffer), __LINE__, DRAWSTATE_INVALID_SUBPASS_INDEX, "DS", + "vkCmdNextSubpass(): Attempted to advance beyond final subpass"); + } } lock.unlock(); -- cgit v1.2.3