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/GraphicsEngineOpenGL | |
| 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/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp | 8 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp index 271429ed..a8ba530c 100644 --- a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp @@ -36,7 +36,6 @@ #include "PipelineResourceAttribsGL.hpp" #include "PipelineResourceSignatureBase.hpp" #include "ShaderResourcesGL.hpp" -#include "SRBMemoryAllocator.hpp" // ShaderVariableManagerGL, ShaderResourceCacheGL, and ShaderResourceBindingGLImpl // are required by PipelineResourceSignatureBase @@ -116,11 +115,6 @@ public: return GetHash() != Other.GetHash() || m_BindingCount != Other.m_BindingCount; } - SRBMemoryAllocator& GetSRBMemoryAllocator() - { - return m_SRBMemAllocator; - } - void InitSRBResourceCache(ShaderResourceCacheGL& ResourceCache, IMemoryAllocator& CacheMemAllocator) const; #ifdef DILIGENT_DEVELOPMENT @@ -151,8 +145,6 @@ private: using SamplerPtr = RefCntAutoPtr<ISampler>; SamplerPtr* m_ImmutableSamplers = nullptr; // [m_Desc.NumImmutableSamplers] - - SRBMemoryAllocator m_SRBMemAllocator; }; } // namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp index d5380fb3..9fb5a827 100644 --- a/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp @@ -90,8 +90,7 @@ PipelineResourceSignatureGLImpl::PipelineResourceSignatureGLImpl(IReferenceCount RenderDeviceGLImpl* pDeviceGL, const PipelineResourceSignatureDesc& Desc, bool bIsDeviceInternal) : - TPipelineResourceSignatureBase{pRefCounters, pDeviceGL, Desc, bIsDeviceInternal}, - m_SRBMemAllocator{GetRawAllocator()} + TPipelineResourceSignatureBase{pRefCounters, pDeviceGL, Desc, bIsDeviceInternal} { try { |