From e4691d86aaf106dbe08563a4f3712d350c8503f9 Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 9 Mar 2021 22:22:54 -0800 Subject: Unified implementation of IPipelineResourceSignature::IsCompatibleWith --- .../include/PipelineResourceSignatureGLImpl.hpp | 17 -------------- .../src/PipelineResourceSignatureGLImpl.cpp | 27 ---------------------- 2 files changed, 44 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp index db8f0246..bd45ab08 100644 --- a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp @@ -98,23 +98,6 @@ public: } } - /// Implementation of IPipelineResourceSignature::IsCompatibleWith. - virtual bool DILIGENT_CALL_TYPE IsCompatibleWith(const IPipelineResourceSignature* pPRS) const override final - { - if (pPRS == nullptr) - { - return GetHash() == 0; - } - return IsCompatibleWith(*ValidatedCast(pPRS)); - } - - bool IsCompatibleWith(const PipelineResourceSignatureGLImpl& Other) const; - - bool IsIncompatibleWith(const PipelineResourceSignatureGLImpl& Other) const - { - return GetHash() != Other.GetHash() || m_BindingCount != Other.m_BindingCount; - } - void InitSRBResourceCache(ShaderResourceCacheGL& ResourceCache); #ifdef DILIGENT_DEVELOPMENT diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp index 8df6dccf..f9d705e9 100644 --- a/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp @@ -480,33 +480,6 @@ void PipelineResourceSignatureGLImpl::InitSRBResourceCache(ShaderResourceCacheGL } } -bool PipelineResourceSignatureGLImpl::IsCompatibleWith(const PipelineResourceSignatureGLImpl& Other) const -{ - if (this == &Other) - return true; - - if (GetHash() != Other.GetHash()) - return false; - - if (m_BindingCount != Other.m_BindingCount) - return false; - - if (!PipelineResourceSignaturesCompatible(GetDesc(), Other.GetDesc())) - return false; - - const auto ResCount = GetTotalResourceCount(); - VERIFY_EXPR(ResCount == Other.GetTotalResourceCount()); - for (Uint32 r = 0; r < ResCount; ++r) - { - const auto& Res = GetResourceAttribs(r); - const auto& OtherRes = Other.GetResourceAttribs(r); - if (!Res.IsCompatibleWith(OtherRes)) - return false; - } - - return true; -} - #ifdef DILIGENT_DEVELOPMENT bool PipelineResourceSignatureGLImpl::DvpValidateCommittedResource(const ShaderResourcesGL::GLResourceAttribs& GLAttribs, RESOURCE_DIMENSION ResourceDim, -- cgit v1.2.3