From 6e0ab595875c3b7451b7c2aef73c40c417cc7a0c Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 13 May 2016 13:01:24 +1200 Subject: layers: use RENDER_PASS_NODE* from pipeline in SC Breaks one more dep from SC guts -> layer_data Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 285ce9e3..2b4cd39d 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -2563,11 +2563,9 @@ static bool validate_and_capture_pipeline_shader_state(layer_data *my_data, PIPE } } - auto rp = pCreateInfo->renderPass != VK_NULL_HANDLE ? my_data->renderPassMap[pCreateInfo->renderPass] : nullptr; - - if (shaders[fragment_stage] && rp) { - pass &= validate_fs_outputs_against_render_pass(my_data->report_data, shaders[fragment_stage], entrypoints[fragment_stage], rp, - pCreateInfo->subpass); + if (shaders[fragment_stage] && pPipeline->renderPass) { + pass &= validate_fs_outputs_against_render_pass(my_data->report_data, shaders[fragment_stage], entrypoints[fragment_stage], + pPipeline->renderPass, pCreateInfo->subpass); } return pass; -- cgit v1.2.3