From 34c2c1b598abfb812cc2ca56f99bbaf93c5e6757 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 20 May 2016 17:14:32 +1200 Subject: layers: Use getDescriptorSetLayout helper in more places Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 1bf27e2d..b182ea02 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -5846,13 +5846,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreatePipelineLayout(VkDevice device, const VkPip plNode.setLayouts.resize(pCreateInfo->setLayoutCount); for (i = 0; i < pCreateInfo->setLayoutCount; ++i) { plNode.descriptorSetLayouts[i] = pCreateInfo->pSetLayouts[i]; - auto set_layout_it = dev_data->descriptorSetLayoutMap.find(pCreateInfo->pSetLayouts[i]); - if (set_layout_it != dev_data->descriptorSetLayoutMap.end()) { - plNode.setLayouts[i] = set_layout_it->second; - } - else { - plNode.setLayouts[i] = nullptr; - } + plNode.setLayouts[i] = getDescriptorSetLayout(dev_data, pCreateInfo->pSetLayouts[i]); } plNode.pushConstantRanges.resize(pCreateInfo->pushConstantRangeCount); for (i = 0; i < pCreateInfo->pushConstantRangeCount; ++i) { -- cgit v1.2.3