From 778c592c76a2a3ab94aaa9676db0a1c2771fe6d3 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Mon, 17 Oct 2016 15:45:49 +1300 Subject: layers: Fix bad use of PIPELINE_STATE ptr value in errors Fixes #1056. Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 7f007b6e..4e82a472 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -3210,7 +3210,8 @@ static bool validatePipelineDrawtimeState(layer_data const *my_data, LAST_BOUND_ reinterpret_cast(pPipeline->pipeline), __LINE__, DRAWSTATE_RENDERPASS_INCOMPATIBLE, "DS", "At Draw time the active render pass (0x%" PRIxLEAST64 ") is incompatible w/ gfx pipeline " "(0x%" PRIxLEAST64 ") that was created w/ render pass (0x%" PRIxLEAST64 ") due to: %s", - reinterpret_cast(pCB->activeRenderPass->renderPass), reinterpret_cast(pPipeline), + reinterpret_cast(pCB->activeRenderPass->renderPass), + reinterpret_cast(pPipeline->pipeline), reinterpret_cast(pPipeline->graphicsPipelineCI.renderPass), err_string.c_str()); } @@ -3488,7 +3489,8 @@ static bool verifyPipelineCreateState(layer_data *my_data, const VkDevice device // If a rasterization state is provided, make sure that the line width conforms to the HW. if (pPipeline->graphicsPipelineCI.pRasterizationState) { if (!isDynamic(pPipeline, VK_DYNAMIC_STATE_LINE_WIDTH)) { - skip_call |= verifyLineWidth(my_data, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, reinterpret_cast(pPipeline), + skip_call |= verifyLineWidth(my_data, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, + reinterpret_cast(pPipeline->pipeline), pPipeline->graphicsPipelineCI.pRasterizationState->lineWidth); } } -- cgit v1.2.3