From 9557cc3e3feb80245e75b1b7966574e52d8dd115 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Thu, 26 May 2016 13:12:38 -0600 Subject: layers: Make layer_data const in getPoolNode() Remove "[]" map operator and use iterator from find instead to return pool ptr so that layer_data param can be const. This will allow this function to be used from "PreValidate" calls where no state is changed. --- layers/core_validation.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 933c2f2d..ff93d9a6 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -3122,11 +3122,12 @@ static void deletePipelines(layer_data *my_data) { // Block of code at start here specifically for managing/tracking DSs // Return Pool node ptr for specified pool or else NULL -static DESCRIPTOR_POOL_NODE *getPoolNode(layer_data *my_data, const VkDescriptorPool pool) { - if (my_data->descriptorPoolMap.find(pool) == my_data->descriptorPoolMap.end()) { +static DESCRIPTOR_POOL_NODE *getPoolNode(const layer_data *dev_data, const VkDescriptorPool pool) { + auto pool_it = dev_data->descriptorPoolMap.find(pool); + if (pool_it == dev_data->descriptorPoolMap.end()) { return NULL; } - return my_data->descriptorPoolMap[pool]; + return pool_it->second; } // Return false if update struct is of valid type, otherwise flag error and return code from callback -- cgit v1.2.3