diff options
| author | Tobin Ehlis <tobine@google.com> | 2017-06-21 10:16:10 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2017-06-21 10:51:36 -0600 |
| commit | 6d8923d41ff611456d52b25543a9a19f66bb89bf (patch) | |
| tree | 2b1aca157f4957fd37bd1d6fa9e2bd46889451bc /layers/core_validation.cpp | |
| parent | a2e99be395d6d5158bad8b902c01bfcfaa9ad10d (diff) | |
| download | usermoji-6d8923d41ff611456d52b25543a9a19f66bb89bf.tar.xz | |
layers:Make DSLayout const in shared_ptrs
Declare DescriptorSetLayout's const for shared_ptrs in Pipeline layout
and DSAllocate structs.
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index cf4b738a..62bdb774 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -149,7 +149,7 @@ struct layer_data { unordered_map<VkCommandPool, COMMAND_POOL_NODE> commandPoolMap; unordered_map<VkDescriptorPool, DESCRIPTOR_POOL_STATE *> descriptorPoolMap; unordered_map<VkDescriptorSet, cvdescriptorset::DescriptorSet *> setMap; - unordered_map<VkDescriptorSetLayout, std::shared_ptr<cvdescriptorset::DescriptorSetLayout>> descriptorSetLayoutMap; + unordered_map<VkDescriptorSetLayout, std::shared_ptr<cvdescriptorset::DescriptorSetLayout const>> descriptorSetLayoutMap; unordered_map<VkPipelineLayout, PIPELINE_LAYOUT_NODE> pipelineLayoutMap; unordered_map<VkDeviceMemory, unique_ptr<DEVICE_MEM_INFO>> memObjMap; unordered_map<VkFence, FENCE_NODE> fenceMap; @@ -709,8 +709,8 @@ FRAMEBUFFER_STATE *GetFramebufferState(const layer_data *dev_data, VkFramebuffer return it->second.get(); } -std::shared_ptr<cvdescriptorset::DescriptorSetLayout> const GetDescriptorSetLayout(layer_data const *dev_data, - VkDescriptorSetLayout dsLayout) { +std::shared_ptr<cvdescriptorset::DescriptorSetLayout const> const GetDescriptorSetLayout(layer_data const *dev_data, + VkDescriptorSetLayout dsLayout) { auto it = dev_data->descriptorSetLayoutMap.find(dsLayout); if (it == dev_data->descriptorSetLayoutMap.end()) { return nullptr; |
