diff options
| author | azhirnov <zh1dron@gmail.com> | 2021-02-12 20:48:59 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:31:36 +0000 |
| commit | 7bff76e30087a28b3c002852e1627f2828c0586c (patch) | |
| tree | 309d604279efc92c8a7d7cf8d14bb492281a0e7d /Graphics/GraphicsEngineVulkan | |
| parent | PipelineResourceSignatureD3D12Impl: some code reorganization (diff) | |
| download | DiligentCore-7bff76e30087a28b3c002852e1627f2828c0586c.tar.gz DiligentCore-7bff76e30087a28b3c002852e1627f2828c0586c.zip | |
PSO small refactoring
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp index f00f0ec4..a37638dd 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp @@ -70,7 +70,7 @@ public: virtual bool DILIGENT_CALL_TYPE IsCompatibleWith(const IPipelineState* pPSO) const override final; /// Implementation of IPipelineStateVk::GetRenderPass(). - virtual IRenderPassVk* DILIGENT_CALL_TYPE GetRenderPass() const override final { return m_pRenderPass.RawPtr<IRenderPassVk>(); } + virtual IRenderPassVk* DILIGENT_CALL_TYPE GetRenderPass() const override final { return GetRenderPassPtr().RawPtr<IRenderPassVk>(); } /// Implementation of IPipelineStateVk::GetVkPipeline(). virtual VkPipeline DILIGENT_CALL_TYPE GetVkPipeline() const override final { return m_Pipeline; } @@ -132,8 +132,6 @@ private: void Destruct(); - void* m_pRawMem = nullptr; // AZ TODO: move to base class - VulkanUtilities::PipelineWrapper m_Pipeline; PipelineLayoutVk m_PipelineLayout; diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index f40bbe19..d12a64b9 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -988,8 +988,6 @@ PipelineStateVkImpl::TShaderStages PipelineStateVkImpl::InitInternalObjects( // Create shader modules and initialize shader stages InitPipelineShaderStages(LogicalDevice, ShaderStages, ShaderModules, vkShaderStages); - m_pRawMem = MemPool.ReleaseOwnership(); - return ShaderStages; } @@ -1003,7 +1001,7 @@ PipelineStateVkImpl::PipelineStateVkImpl(IReferenceCounters* pRefCounters, Rende InitInternalObjects(CreateInfo, vkShaderStages, ShaderModules); - CreateGraphicsPipeline(pDeviceVk, vkShaderStages, m_PipelineLayout, m_Desc, GetGraphicsPipelineDesc(), m_Pipeline, m_pRenderPass); + CreateGraphicsPipeline(pDeviceVk, vkShaderStages, m_PipelineLayout, m_Desc, GetGraphicsPipelineDesc(), m_Pipeline, GetRenderPassPtr()); } catch (...) { @@ -1072,13 +1070,6 @@ void PipelineStateVkImpl::Destruct() m_pDevice->SafeReleaseDeviceObject(std::move(m_Pipeline), m_Desc.CommandQueueMask); m_PipelineLayout.Release(m_pDevice, m_Desc.CommandQueueMask); - - auto& RawAllocator = GetRawAllocator(); - if (m_pRawMem) - { - RawAllocator.Free(m_pRawMem); - m_pRawMem = nullptr; - } } bool PipelineStateVkImpl::IsCompatibleWith(const IPipelineState* pPSO) const |