diff options
| author | Chris Forbes <chrisforbes@google.com> | 2017-08-15 11:23:40 -0700 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-08-16 10:39:46 -0700 |
| commit | 6feaec9534d1c294702e5feb7d553b31c1fb63ca (patch) | |
| tree | 5dd7f0f6fc101f46a1f268ee31915b248f84a72a /layers | |
| parent | 2f827ff2751e8de41808ad14671b8579f8bb9e95 (diff) | |
| download | usermoji-6feaec9534d1c294702e5feb7d553b31c1fb63ca.tar.xz | |
layers: inline set_cb_pso_status into sole caller
Diffstat (limited to 'layers')
| -rw-r--r-- | layers/core_validation.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 5608d179..2bd6b8ac 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -1809,11 +1809,6 @@ CBStatusFlags MakeStaticStateMask(VkPipelineDynamicStateCreateInfo const *ds) { return flags; } -// Set PSO-related status bits for CB, including dynamic state set via PSO -static void set_cb_pso_status(GLOBAL_CB_NODE *pCB, const PIPELINE_STATE *pPipe) { - pCB->status |= MakeStaticStateMask(pPipe->graphicsPipelineCI.ptr()->pDynamicState); -} - // Flags validation error if the associated call is made inside a render pass. The apiName routine should ONLY be called outside a // render pass. bool insideRenderPass(const layer_data *dev_data, const GLOBAL_CB_NODE *pCB, const char *apiName, @@ -5138,7 +5133,7 @@ VKAPI_ATTR void VKAPI_CALL CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipe PIPELINE_STATE *pipe_state = getPipelineState(dev_data, pipeline); if (pipe_state) { cb_state->lastBound[pipelineBindPoint].pipeline_state = pipe_state; - set_cb_pso_status(cb_state, pipe_state); + pCB->status |= MakeStaticStateMask(pipe_state->graphicsPipelineCI.ptr()->pDynamicState); set_pipeline_state(pipe_state); skip |= validate_dual_src_blend_feature(dev_data, pipe_state); } else { |