layers: Add getSamplerNode() helper

Kill sampler_map_ in DescriptorSet and add getSamplerNode() helper
and use it instead.

1 files changed, 9 insertions, 1 deletions

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 844503dc..2f4a5e82 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -261,6 +261,14 @@ struct shader_module {
 // TODO : This can be much smarter, using separate locks for separate global data
 static std::mutex global_lock;
 
+// Return sampler node ptr for specified sampler or else NULL
+SAMPLER_NODE *getSamplerNode(const layer_data *my_data, const VkSampler sampler) {
+    auto sampler_it = my_data->samplerMap.find(sampler);
+    if (sampler_it == my_data->samplerMap.end()) {
+        return nullptr;
+    }
+    return sampler_it->second.get();
+}
 // Return buffer node ptr for specified buffer or else NULL
 BUFFER_NODE *getBufferNode(const layer_data *my_data, const VkBuffer buffer) {
     auto buff_it = my_data->bufferMap.find(buffer);
@@ -5885,7 +5893,7 @@ static void PostCallRecordAllocateDescriptorSets(layer_data *dev_data, const VkD
     // 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->samplerMap, dev_data->imageViewMap, dev_data->imageMap,
+        dev_data->descriptorSetLayoutMap, dev_data->imageViewMap, dev_data->imageMap,
         dev_data->device_extensions.imageToSwapchainMap, dev_data->device_extensions.swapchainMap);
 }