From c5366f2743146b95dc23c26d7acba9e7fbe393b3 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Tue, 20 Jun 2017 08:30:39 -0600 Subject: layers:Migrate DSLayout to shared_ptr Update Descriptor Set Layout copy in Descriptor Set, as well as various ptr references to use shared_ptr. This fixes some potential memory leaks and makes Descriptor Set class lighter weight. --- layers/core_validation.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index ebc9d8d9..72b8bcd5 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -709,12 +709,13 @@ FRAMEBUFFER_STATE *GetFramebufferState(const layer_data *dev_data, VkFramebuffer return it->second.get(); } -cvdescriptorset::DescriptorSetLayout const *GetDescriptorSetLayout(layer_data const *dev_data, VkDescriptorSetLayout dsLayout) { +std::shared_ptr const GetDescriptorSetLayout(layer_data const *dev_data, + VkDescriptorSetLayout dsLayout) { auto it = dev_data->descriptorSetLayoutMap.find(dsLayout); if (it == dev_data->descriptorSetLayoutMap.end()) { return nullptr; } - return it->second.get(); + return it->second; } static PIPELINE_LAYOUT_NODE const *getPipelineLayout(layer_data const *dev_data, VkPipelineLayout pipeLayout) { -- cgit v1.2.3