diff options
| author | Chris Forbes <chrisforbes@google.com> | 2016-03-30 13:21:20 +1300 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-03-30 07:00:00 -0600 |
| commit | 60c7a26a3fcda5462fb1e9e1760fd886adac3f89 (patch) | |
| tree | 6345911baeec08f8dd5bc3d131a194c24223e8f8 | |
| parent | b1ee3d7f17b60a06f92e982fb207a0eb658510ef (diff) | |
| download | usermoji-60c7a26a3fcda5462fb1e9e1760fd886adac3f89.tar.xz | |
layers: More slight tidying of SC pass
Signed-off-by: Chris Forbes <chrisforbes@google.com>
| -rw-r--r-- | layers/core_validation.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 9acf1ce5..cb52854d 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -2748,11 +2748,11 @@ static VkBool32 validate_and_capture_pipeline_shader_state(layer_data *my_data, vi = pCreateInfo->pVertexInputState; if (vi) { - pass = validate_vi_consistency(my_data, vi) && pass; + pass &= validate_vi_consistency(my_data, vi); } if (shaders[vertex_stage]) { - pass = validate_vi_against_vs_inputs(my_data, vi, shaders[vertex_stage], entrypoints[vertex_stage]) && pass; + pass &= validate_vi_against_vs_inputs(my_data, vi, shaders[vertex_stage], entrypoints[vertex_stage]); } int producer = get_shader_stage_id(VK_SHADER_STAGE_VERTEX_BIT); @@ -2766,11 +2766,10 @@ static VkBool32 validate_and_capture_pipeline_shader_state(layer_data *my_data, for (; producer != fragment_stage && consumer <= fragment_stage; consumer++) { assert(shaders[producer]); if (shaders[consumer]) { - pass = validate_interface_between_stages(my_data, shaders[producer], entrypoints[producer], + pass &= validate_interface_between_stages(my_data, shaders[producer], entrypoints[producer], shader_stage_attribs[producer].name, shaders[consumer], entrypoints[consumer], shader_stage_attribs[consumer].name, - shader_stage_attribs[consumer].arrayed_input) && - pass; + shader_stage_attribs[consumer].arrayed_input); producer = consumer; } @@ -2779,9 +2778,8 @@ static VkBool32 validate_and_capture_pipeline_shader_state(layer_data *my_data, 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, shaders[fragment_stage], entrypoints[fragment_stage], rp, - pCreateInfo->subpass) && - pass; + pass &= validate_fs_outputs_against_render_pass(my_data, shaders[fragment_stage], entrypoints[fragment_stage], rp, + pCreateInfo->subpass); } return pass; |