From 228f25373ba2f1678ddcccba101c43a4612e1919 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sun, 7 Mar 2021 20:06:24 -0800 Subject: Unified implementation of InitializeStaticSRBResources in D3D12, Vk and GL backends --- .../include/PipelineResourceSignatureGLImpl.hpp | 5 +---- .../src/PipelineResourceSignatureGLImpl.cpp | 10 ---------- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp index c96e627f..271429ed 100644 --- a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp @@ -109,9 +109,6 @@ public: return IsCompatibleWith(*ValidatedCast(pPRS)); } - /// Implementation of IPipelineResourceSignature::InitializeStaticSRBResources. - virtual void DILIGENT_CALL_TYPE InitializeStaticSRBResources(IShaderResourceBinding* pSRB) const override final; - bool IsCompatibleWith(const PipelineResourceSignatureGLImpl& Other) const; bool IsIncompatibleWith(const PipelineResourceSignatureGLImpl& Other) const @@ -137,10 +134,10 @@ public: const char* PSOName) const; #endif -private: // Copies static resources from the static resource cache to the destination cache void CopyStaticResources(ShaderResourceCacheGL& ResourceCache) const; +private: void CreateLayouts(); void Destruct(); diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp index 264f30e1..d5380fb3 100644 --- a/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp @@ -419,16 +419,6 @@ void PipelineResourceSignatureGLImpl::ApplyBindings(GLObjectWrappers::GLProgramO State.SetProgram(GLObjectWrappers::GLProgramObj::Null()); } -void PipelineResourceSignatureGLImpl::InitializeStaticSRBResources(IShaderResourceBinding* pSRB) const -{ - InitializeStaticSRBResourcesImpl(ValidatedCast(pSRB), - [&](ShaderResourceBindingGLImpl* pSRBGL) // - { - CopyStaticResources(pSRBGL->GetResourceCache()); - } // - ); -} - void PipelineResourceSignatureGLImpl::CopyStaticResources(ShaderResourceCacheGL& DstResourceCache) const { if (m_pStaticResCache == nullptr) -- cgit v1.2.3