aboutsummaryrefslogtreecommitdiff
path: root/layers/shader_validation.cpp
diff options
context:
space:
mode:
authorPetr Kraus <petr_kraus@email.cz>2017-12-14 20:57:36 +0100
committerTobin Ehlis <tobine@google.com>2017-12-15 12:35:29 -0700
commit7f36ca0776f1d8d801fc85bb87a23ff440db5dd3 (patch)
tree4a62b28649278ef5024bca7cfd4149fdae247dac /layers/shader_validation.cpp
parentacfe0d1a7d6dd1bcc7df02f4bb491d42e7abbdde (diff)
downloadusermoji-7f36ca0776f1d8d801fc85bb87a23ff440db5dd3.tar.xz
layers: Fix Graphics Pipeline pointers not ignored
Some VkGraphicsPipelineCreateInfo pointers must be ignored under some conditions, but were not in the layers. Add relevant tests. Fix tests found broken (using depth or color without attachment in subpass)
Diffstat (limited to 'layers/shader_validation.cpp')
-rw-r--r--layers/shader_validation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp
index 7847e3de..0af30fbe 100644
--- a/layers/shader_validation.cpp
+++ b/layers/shader_validation.cpp
@@ -771,7 +771,7 @@ 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, PIPELINE_STATE const *pipeline,
uint32_t subpass_index) {
- auto rpci = pipeline->render_pass_ci.ptr();
+ auto rpci = pipeline->rp_state->createInfo.ptr();
std::map<uint32_t, VkFormat> color_attachments;
auto subpass = rpci->pSubpasses[subpass_index];
@@ -1356,7 +1356,7 @@ static bool validate_pipeline_shader_stage(
if (pStage->stage == VK_SHADER_STAGE_FRAGMENT_BIT) {
auto input_attachment_uses = collect_interface_by_input_attachment_index(module, accessible_ids);
- auto rpci = pipeline->render_pass_ci.ptr();
+ auto rpci = pipeline->rp_state->createInfo.ptr();
auto subpass = pipeline->graphicsPipelineCI.subpass;
for (auto use : input_attachment_uses) {