From 900565ad1256074909c971ea49478473d8587880 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sun, 7 Mar 2021 20:25:30 -0800 Subject: Moved m_SRBMemAllocator to PipelineResourceSignatureBase --- .../include/PipelineResourceSignatureVkImpl.hpp | 7 ------- .../GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp index 35a91067..2c3a4a55 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp @@ -126,11 +126,6 @@ public: return IsCompatibleWith(*ValidatedCast(pPRS)); } - SRBMemoryAllocator& GetSRBMemoryAllocator() - { - return m_SRBMemAllocator; - } - void InitSRBResourceCache(ShaderResourceCacheVk& ResourceCache, IMemoryAllocator& CacheMemAllocator, const char* DbgPipelineName) const; @@ -222,8 +217,6 @@ private: Uint16 m_DynamicStorageBufferCount = 0; ImmutableSamplerAttribs* m_ImmutableSamplers = nullptr; // [m_Desc.NumImmutableSamplers] - - SRBMemoryAllocator m_SRBMemAllocator; }; template <> Uint32 PipelineResourceSignatureVkImpl::GetDescriptorSetIndex() const; diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp index e896d9b7..94a981d6 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp @@ -224,8 +224,7 @@ PipelineResourceSignatureVkImpl::PipelineResourceSignatureVkImpl(IReferenceCount RenderDeviceVkImpl* pDevice, const PipelineResourceSignatureDesc& Desc, bool bIsDeviceInternal) : - TPipelineResourceSignatureBase{pRefCounters, pDevice, Desc, bIsDeviceInternal}, - m_SRBMemAllocator{GetRawAllocator()} + TPipelineResourceSignatureBase{pRefCounters, pDevice, Desc, bIsDeviceInternal} { try { -- cgit v1.2.3