From 7b12a7cee413342591f594d890dc70153a01d1af Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 31 Jan 2017 10:55:50 -0700 Subject: [PATCH] layers: GH1390, Fix renderpass handle output The CV CmdBeginRenderPass validation was using the incorrect variable to output the renderpass handle in error messages. Change-Id: I902a04ba7009557257732e0ff65d98aa93f88f31 --- layers/core_validation.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 0267a15..02c715a 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -10838,24 +10838,25 @@ VKAPI_ATTR void VKAPI_CALL CmdBeginRenderPass(VkCommandBuffer commandBuffer, con if (clear_op_size > pRenderPassBegin->clearValueCount) { skip_call |= log_msg( dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT, - reinterpret_cast(renderPass), __LINE__, VALIDATION_ERROR_00442, "DS", + reinterpret_cast(renderPass->renderPass), __LINE__, VALIDATION_ERROR_00442, "DS", "In vkCmdBeginRenderPass() the VkRenderPassBeginInfo struct has a clearValueCount of %u but there must " "be at least %u entries in pClearValues array to account for the highest index attachment in renderPass " "0x%" PRIx64 " that uses VK_ATTACHMENT_LOAD_OP_CLEAR is %u. Note that the pClearValues array " "is indexed by attachment number so even if some pClearValues entries between 0 and %u correspond to " "attachments that aren't cleared they will be ignored. %s", - pRenderPassBegin->clearValueCount, clear_op_size, reinterpret_cast(renderPass), clear_op_size, - clear_op_size - 1, validation_error_map[VALIDATION_ERROR_00442]); + pRenderPassBegin->clearValueCount, clear_op_size, reinterpret_cast(renderPass->renderPass), + clear_op_size, clear_op_size - 1, validation_error_map[VALIDATION_ERROR_00442]); } if (clear_op_size < pRenderPassBegin->clearValueCount) { skip_call |= log_msg( dev_data->report_data, VK_DEBUG_REPORT_WARNING_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT, - reinterpret_cast(renderPass), __LINE__, DRAWSTATE_RENDERPASS_TOO_MANY_CLEAR_VALUES, "DS", + reinterpret_cast(renderPass->renderPass), __LINE__, DRAWSTATE_RENDERPASS_TOO_MANY_CLEAR_VALUES, + "DS", "In vkCmdBeginRenderPass() the VkRenderPassBeginInfo struct has a clearValueCount of %u but only first %u " "entries in pClearValues array are used. The highest index attachment in renderPass 0x%" PRIx64 " that uses VK_ATTACHMENT_LOAD_OP_CLEAR is %u - other pClearValues are ignored.", - pRenderPassBegin->clearValueCount, clear_op_size, reinterpret_cast(renderPass), clear_op_size); + pRenderPassBegin->clearValueCount, clear_op_size, reinterpret_cast(renderPass->renderPass), clear_op_size); } skip_call |= VerifyRenderAreaBounds(dev_data, pRenderPassBegin); skip_call |= VerifyFramebufferAndRenderPassLayouts(dev_data, cb_node, pRenderPassBegin); -- 2.7.4