From 7bff76e30087a28b3c002852e1627f2828c0586c Mon Sep 17 00:00:00 2001 From: azhirnov Date: Fri, 12 Feb 2021 23:48:59 +0300 Subject: PSO small refactoring --- Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp | 2 -- Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 9 --------- 2 files changed, 11 deletions(-) (limited to 'Graphics/GraphicsEngineD3D12') diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp index 91881398..bbfb6611 100644 --- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp +++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp @@ -123,8 +123,6 @@ private: Uint8 m_SignatureCount = 0; SignatureArrayType m_Signatures = {}; - void* m_pRawMem = nullptr; // AZ TODO: move to base class - #ifdef DILIGENT_DEVELOPMENT // Shader resources for all shaders in all shader stages std::vector> m_ShaderResources; diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index f83c89d2..0fc12cdf 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -668,8 +668,6 @@ void PipelineStateD3D12Impl::InitInternalObjects(const PSOCreateInfoType& Create MemPool.Reserve(); - m_pRawMem = MemPool.ReleaseOwnership(); - InitializePipelineDesc(CreateInfo, MemPool); // It is important to construct all objects before initializing them because if an exception is thrown, @@ -983,13 +981,6 @@ void PipelineStateD3D12Impl::Destruct() m_Signatures.fill({}); m_RootSig.Release(); - auto& RawAllocator = GetRawAllocator(); - if (m_pRawMem) - { - RawAllocator.Free(m_pRawMem); - m_pRawMem = nullptr; - } - if (m_pd3d12PSO) { // D3D12 object can only be destroyed when it is no longer used by the GPU -- cgit v1.2.3