From 032765580168eedf52e8260c87ab2f998e3e787c Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 21 Jun 2017 11:34:16 -0700 Subject: layers: Don't accidentally copy pipeline layout again in SC --- layers/shader_validation.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'layers/shader_validation.cpp') diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp index 282f7660..c6697f90 100644 --- a/layers/shader_validation.cpp +++ b/layers/shader_validation.cpp @@ -1301,10 +1301,8 @@ static bool validate_pipeline_shader_stage( // Validate descriptor set layout against what the entrypoint actually uses auto descriptor_uses = collect_interface_by_descriptor_slot(report_data, module, accessible_ids); - auto pipelineLayout = pipeline->pipeline_layout; - skip |= validate_specialization_offsets(report_data, pStage); - skip |= validate_push_constant_usage(report_data, &pipelineLayout.push_constant_ranges, module, accessible_ids, pStage->stage); + skip |= validate_push_constant_usage(report_data, &pipeline->pipeline_layout.push_constant_ranges, module, accessible_ids, pStage->stage); // Validate descriptor use for (auto use : descriptor_uses) { @@ -1313,7 +1311,7 @@ static bool validate_pipeline_shader_stage( reqs = descriptor_req(reqs | descriptor_type_to_reqs(module, use.second.type_id)); // Verify given pipelineLayout has requested setLayout with requested binding - const auto &binding = get_descriptor_binding(&pipelineLayout, use.first); + const auto &binding = get_descriptor_binding(&pipeline->pipeline_layout, use.first); unsigned required_descriptor_count; if (!binding) { -- cgit v1.2.3