From 900565ad1256074909c971ea49478473d8587880 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Sun, 7 Mar 2021 20:25:30 -0800
Subject: Moved m_SRBMemAllocator to PipelineResourceSignatureBase

---
 .../include/PipelineResourceSignatureGLImpl.hpp                   | 8 --------
 .../GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp  | 3 +--
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'Graphics/GraphicsEngineOpenGL')

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
     {
-- 
cgit v1.2.3