diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-03-08 04:25:30 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:38:17 +0000 |
| commit | 900565ad1256074909c971ea49478473d8587880 (patch) | |
| tree | d1cf6173fab1617df229aea374fa65e06de44f58 /Graphics/GraphicsEngineVulkan | |
| parent | Unified implementation of InitializeStaticSRBResources in D3D12, Vk and GL ba... (diff) | |
| download | DiligentCore-900565ad1256074909c971ea49478473d8587880.tar.gz DiligentCore-900565ad1256074909c971ea49478473d8587880.zip | |
Moved m_SRBMemAllocator to PipelineResourceSignatureBase
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp | 7 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp | 3 |
2 files changed, 1 insertions, 9 deletions
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<const PipelineResourceSignatureVkImpl>(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<PipelineResourceSignatureVkImpl::DESCRIPTOR_SET_ID_STATIC_MUTABLE>() 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 { |