From dfb3f98a83a646abff564a159d556f03432826ac Mon Sep 17 00:00:00 2001 From: azhirnov Date: Mon, 25 Jan 2021 18:58:28 +0300 Subject: removed empty signature, added test for partially compatible pipeline layouts --- .../GraphicsEngine/include/PipelineStateBase.hpp | 65 ---------------------- 1 file changed, 65 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp index 2c4a0729..5e60f613 100644 --- a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp +++ b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp @@ -234,71 +234,6 @@ public: return m_pRayTracingPipelineData->Desc; } - virtual void DILIGENT_CALL_TYPE CreateShaderResourceBinding(IShaderResourceBinding** ppShaderResourceBinding, - bool InitStaticResources) override final - { - *ppShaderResourceBinding = nullptr; - - if (this->GetResourceSignatureCount() != 1) - { - LOG_ERROR_MESSAGE("PipelineState::CreateShaderResourceBinding is only allowed for pipelines that use a single " - "resource signature. Use IPipelineResourceSignature::CreateShaderResourceBinding instead."); - return; - } - - return this->GetResourceSignature(0)->CreateShaderResourceBinding(ppShaderResourceBinding, InitStaticResources); - } - - virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetStaticVariableByName(SHADER_TYPE ShaderType, - const Char* Name) override final - { - if (this->GetResourceSignatureCount() != 1) - { - LOG_ERROR_MESSAGE("PipelineState::CreateShaderResourceBinding is only allowed for pipelines that use a single " - "resource signature. Use IPipelineResourceSignature::GetStaticVariableByName instead."); - return nullptr; - } - - return this->GetResourceSignature(0)->GetStaticVariableByName(ShaderType, Name); - } - - virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetStaticVariableByIndex(SHADER_TYPE ShaderType, - Uint32 Index) override final - { - if (this->GetResourceSignatureCount() != 1) - { - LOG_ERROR_MESSAGE("PipelineState::GetStaticVariableByIndex is only allowed for pipelines that use a single " - "resource signature. Use IPipelineResourceSignature::GetStaticVariableByIndex instead."); - return nullptr; - } - - return this->GetResourceSignature(0)->GetStaticVariableByIndex(ShaderType, Index); - } - - virtual Uint32 DILIGENT_CALL_TYPE GetStaticVariableCount(SHADER_TYPE ShaderType) const override final - { - if (this->GetResourceSignatureCount() != 1) - { - LOG_ERROR_MESSAGE("PipelineState::GetStaticVariableCount is only allowed for pipelines that use a single " - "resource signature. Use IPipelineResourceSignature::GetStaticVariableCount instead."); - return 0; - } - - return this->GetResourceSignature(0)->GetStaticVariableCount(ShaderType); - } - - virtual void DILIGENT_CALL_TYPE BindStaticResources(Uint32 ShaderFlags, IResourceMapping* pResourceMapping, Uint32 Flags) override final - { - if (this->GetResourceSignatureCount() != 1) - { - LOG_ERROR_MESSAGE("PipelineState::BindStaticResources is only allowed for pipelines that use a single " - "resource signature. Use IPipelineResourceSignature::BindStaticResources instead."); - return; - } - - return this->GetResourceSignature(0)->BindStaticResources(ShaderFlags, pResourceMapping, Flags); - } - inline void CopyShaderHandle(const char* Name, void* pData, size_t DataSize) const { VERIFY_EXPR(this->m_Desc.IsRayTracingPipeline()); -- cgit v1.2.3