From e926298faf8f17577c470e115cd74ac73ba7da9e Mon Sep 17 00:00:00 2001
From: Tobin Ehlis <tobine@google.com>
Date: Thu, 2 Jun 2016 11:56:40 -0600
Subject: layers: Remove unneeded layout_map

---
 layers/core_validation.cpp | 3 +--
 layers/descriptor_sets.cpp | 1 -
 layers/descriptor_sets.h   | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index a117ed72..f0dede6c 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -5907,8 +5907,7 @@ static void PostCallRecordAllocateDescriptorSets(layer_data *dev_data, const VkD
                                                  const cvdescriptorset::AllocateDescriptorSetsData *common_data) {
     // All the updates are contained in a single cvdescriptorset function
     cvdescriptorset::PerformAllocateDescriptorSets(pAllocateInfo, pDescriptorSets, common_data, &dev_data->descriptorPoolMap,
-                                                   &dev_data->setMap, dev_data, dev_data->descriptorSetLayoutMap,
-                                                   dev_data->device_extensions.imageToSwapchainMap,
+                                                   &dev_data->setMap, dev_data, dev_data->device_extensions.imageToSwapchainMap,
                                                    dev_data->device_extensions.swapchainMap);
 }
 
diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp
index 9039a122..795f5d71 100644
--- a/layers/descriptor_sets.cpp
+++ b/layers/descriptor_sets.cpp
@@ -1280,7 +1280,6 @@ void cvdescriptorset::PerformAllocateDescriptorSets(
     const VkDescriptorSetAllocateInfo *p_alloc_info, const VkDescriptorSet *descriptor_sets,
     const AllocateDescriptorSetsData *ds_data, std::unordered_map<VkDescriptorPool, DESCRIPTOR_POOL_NODE *> *pool_map,
     std::unordered_map<VkDescriptorSet, cvdescriptorset::DescriptorSet *> *set_map, const core_validation::layer_data *dev_data,
-    const std::unordered_map<VkDescriptorSetLayout, cvdescriptorset::DescriptorSetLayout *> &layout_map,
     const std::unordered_map<VkImage, VkSwapchainKHR> &image_to_swapchain_map,
     const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> &swapchain_map) {
     auto pool_state = (*pool_map)[p_alloc_info->descriptorPool];
diff --git a/layers/descriptor_sets.h b/layers/descriptor_sets.h
index c775c736..365dedf8 100644
--- a/layers/descriptor_sets.h
+++ b/layers/descriptor_sets.h
@@ -267,7 +267,6 @@ void PerformAllocateDescriptorSets(const VkDescriptorSetAllocateInfo *, const Vk
                                    std::unordered_map<VkDescriptorPool, DESCRIPTOR_POOL_NODE *> *,
                                    std::unordered_map<VkDescriptorSet, cvdescriptorset::DescriptorSet *> *,
                                    const core_validation::layer_data *,
-                                   const std::unordered_map<VkDescriptorSetLayout, cvdescriptorset::DescriptorSetLayout *> &,
                                    const std::unordered_map<VkImage, VkSwapchainKHR> &,
                                    const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> &);
 
-- 
cgit v1.2.3