From c986282a32d2126239eada5aa8fd6022e39b2e57 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 20 Jul 2017 11:10:09 -0700 Subject: layers: Pass entire pipeline state down to FS output check --- layers/shader_validation.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'layers/shader_validation.cpp') diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp index c6697f90..e0500305 100644 --- a/layers/shader_validation.cpp +++ b/layers/shader_validation.cpp @@ -768,8 +768,10 @@ static bool validate_vi_against_vs_inputs(debug_report_data const *report_data, } static bool validate_fs_outputs_against_render_pass(debug_report_data const *report_data, shader_module const *fs, - spirv_inst_iter entrypoint, VkRenderPassCreateInfo const *rpci, + spirv_inst_iter entrypoint, PIPELINE_STATE const *pPipeline, uint32_t subpass_index) { + auto rpci = pPipeline->render_pass_ci.ptr(); + std::map color_attachments; auto subpass = rpci->pSubpasses[subpass_index]; for (auto i = 0u; i < subpass.colorAttachmentCount; ++i) { @@ -1495,7 +1497,7 @@ bool validate_and_capture_pipeline_shader_state(layer_data *dev_data, PIPELINE_S if (shaders[fragment_stage] && shaders[fragment_stage]->has_valid_spirv) { skip |= validate_fs_outputs_against_render_pass(report_data, shaders[fragment_stage], entrypoints[fragment_stage], - pPipeline->render_pass_ci.ptr(), pCreateInfo->subpass); + pPipeline, pCreateInfo->subpass); } return skip; -- cgit v1.2.3