diff options
| author | Tobin Ehlis <tobine@google.com> | 2017-09-07 14:24:36 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2017-09-07 14:32:12 -0600 |
| commit | bbf52bb60f7f45e005d50d20668aee1e1e3b7805 (patch) | |
| tree | 4b96dcf5c1ed663670784ee34ad68f5ee438aa48 /layers/core_validation.cpp | |
| parent | 70c56005e0c7606831081cb28e776452cfe3920d (diff) | |
| download | usermoji-bbf52bb60f7f45e005d50d20668aee1e1e3b7805.tar.xz | |
layers:Clean up shared_ptr use
Use make_shared to construct RENDER_PASS_STATE shared_ptr at
CreateRenderPass() time, return the shared_ptr by value from helper
function and accecpt rvalue ref in FRAMEBUFFER_STATE constructor.
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index d262ab8c..b0bc39b8 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -705,7 +705,7 @@ RENDER_PASS_STATE *GetRenderPassState(layer_data const *dev_data, VkRenderPass r return it->second.get(); } -std::shared_ptr<RENDER_PASS_STATE> const GetRenderPassStateSharedPtr(layer_data const *dev_data, VkRenderPass renderpass) { +std::shared_ptr<RENDER_PASS_STATE> GetRenderPassStateSharedPtr(layer_data const *dev_data, VkRenderPass renderpass) { auto it = dev_data->renderPassMap.find(renderpass); if (it == dev_data->renderPassMap.end()) { return nullptr; @@ -7938,7 +7938,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateRenderPass(VkDevice device, const VkRenderP std::vector<int32_t> subpass_to_dep_index(pCreateInfo->subpassCount); skip |= CreatePassDAG(dev_data, pCreateInfo, subpass_to_node, has_self_dependency, subpass_to_dep_index); - auto render_pass = unique_ptr<RENDER_PASS_STATE>(new RENDER_PASS_STATE(pCreateInfo)); + auto render_pass = std::make_shared<RENDER_PASS_STATE>(pCreateInfo); render_pass->renderPass = *pRenderPass; render_pass->hasSelfDependency = has_self_dependency; render_pass->subpassToNode = subpass_to_node; |
