diff options
| author | Chris Forbes <chrisforbes@google.com> | 2017-08-16 13:16:31 -0700 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-08-17 09:49:34 -0700 |
| commit | 5ecdc12e4f0451468596b4d8591dfae384d66c43 (patch) | |
| tree | acc3d9e076f591aa1d39dc2d323e04e7fce16f4a | |
| parent | 0275af027986981e387049efcc1473989dac68be (diff) | |
| download | usermoji-5ecdc12e4f0451468596b4d8591dfae384d66c43.tar.xz | |
layers: Drop out some redundant checks already covered by OT
| -rw-r--r-- | layers/core_validation.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 7a506088..9c79bfe8 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -5140,21 +5140,12 @@ VKAPI_ATTR void VKAPI_CALL CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipe auto pipe_state = getPipelineState(dev_data, pipeline); if (VK_PIPELINE_BIND_POINT_GRAPHICS == pipelineBindPoint) { cb_state->status &= ~cb_state->static_status; - if (pipe_state) { - cb_state->static_status = MakeStaticStateMask(pipe_state->graphicsPipelineCI.ptr()->pDynamicState); - cb_state->status |= cb_state->static_status; - } - } - if (pipe_state) { - cb_state->lastBound[pipelineBindPoint].pipeline_state = pipe_state; - set_pipeline_state(pipe_state); - skip |= validate_dual_src_blend_feature(dev_data, pipe_state); - } else { - skip |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, - HandleToUint64(pipeline), __LINE__, VALIDATION_ERROR_18027e01, "DS", - "Attempt to bind Pipeline 0x%" PRIxLEAST64 " that doesn't exist! %s", HandleToUint64(pipeline), - validation_error_map[VALIDATION_ERROR_18027e01]); + cb_state->static_status = MakeStaticStateMask(pipe_state->graphicsPipelineCI.ptr()->pDynamicState); + cb_state->status |= cb_state->static_status; } + cb_state->lastBound[pipelineBindPoint].pipeline_state = pipe_state; + set_pipeline_state(pipe_state); + skip |= validate_dual_src_blend_feature(dev_data, pipe_state); addCommandBufferBinding(&pipe_state->cb_bindings, {HandleToUint64(pipeline), kVulkanObjectTypePipeline}, cb_state); if (VK_PIPELINE_BIND_POINT_GRAPHICS == pipelineBindPoint) { // Add binding for child renderpass |