From 3b412cad8970cb2933f294d9a1648274938c04de Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 21 Jun 2017 13:21:13 -0700 Subject: layers: Inline pre-validate into CreateGraphicsPipelines All this did was loop over the pipelines and call a function. --- layers/core_validation.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index f55c3c3b..a20db67e 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -4405,15 +4405,6 @@ bool validate_dual_src_blend_feature(layer_data *device_data, PIPELINE_STATE *pi return skip; } -static bool PreCallCreateGraphicsPipelines(layer_data *device_data, uint32_t count, - const VkGraphicsPipelineCreateInfo *create_infos, vector const &pipe_state) { - bool skip = false; - for (uint32_t i = 0; i < count; i++) { - skip |= verifyPipelineCreateState(device_data, pipe_state, i); - } - return skip; -} - VKAPI_ATTR VkResult VKAPI_CALL CreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { @@ -4436,7 +4427,10 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateGraphicsPipelines(VkDevice device, VkPipeli pipe_state[i]->render_pass_ci.initialize(GetRenderPassState(dev_data, pCreateInfos[i].renderPass)->createInfo.ptr()); pipe_state[i]->pipeline_layout = *getPipelineLayout(dev_data, pCreateInfos[i].layout); } - skip |= PreCallCreateGraphicsPipelines(dev_data, count, pCreateInfos, pipe_state); + + for (i = 0; i < count; i++) { + skip |= verifyPipelineCreateState(dev_data, pipe_state, i); + } lock.unlock(); -- cgit v1.2.3