From 2304b80ad16a9ec86151aa60d54793c5e5365331 Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 26 Jan 2021 18:43:23 -0800 Subject: Moved CreateShaderResourceBinding, GetStaticVariableByName, GetStaticVariableByIndex, GetStaticVariableCount and BindStaticResources from PipelineStateVkImpl back to PipelineStateBase --- .../include/PipelineStateVkImpl.hpp | 17 ------ .../src/PipelineStateVkImpl.cpp | 60 ---------------------- 2 files changed, 77 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp index cafb6518..438b09e9 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp @@ -79,23 +79,6 @@ public: /// Implementation of IPipelineState::GetResourceSignature() in Vulkan backend. virtual IPipelineResourceSignature* DILIGENT_CALL_TYPE GetResourceSignature(Uint32 Index) const override final { return m_PipelineLayout.GetSignature(Index); } - /// Implementation of IPipelineState::CreateShaderResourceBinding() in Vulkan backend. - virtual void DILIGENT_CALL_TYPE CreateShaderResourceBinding(IShaderResourceBinding** ppShaderResourceBinding, - bool InitStaticResources) override final; - - /// Implementation of IPipelineState::GetStaticVariableByName() in Vulkan backend. - virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetStaticVariableByName(SHADER_TYPE ShaderType, - const Char* Name) override final; - - /// Implementation of IPipelineState::GetStaticVariableByIndex() in Vulkan backend. - virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetStaticVariableByIndex(SHADER_TYPE ShaderType, - Uint32 Index) override final; - - /// Implementation of IPipelineState::GetStaticVariableCount() in Vulkan backend. - virtual Uint32 DILIGENT_CALL_TYPE GetStaticVariableCount(SHADER_TYPE ShaderType) const override final; - - virtual void DILIGENT_CALL_TYPE BindStaticResources(Uint32 ShaderFlags, IResourceMapping* pResourceMapping, Uint32 Flags) override final; - const PipelineLayoutVk& GetPipelineLayout() const { return m_PipelineLayout; } static RenderPassDesc GetImplicitRenderPassDesc(Uint32 NumRenderTargets, diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index eb24d1f9..06388005 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -1014,64 +1014,4 @@ bool PipelineStateVkImpl::IsCompatibleWith(const IPipelineState* pPSO) const return false; } -void PipelineStateVkImpl::CreateShaderResourceBinding(IShaderResourceBinding** ppShaderResourceBinding, - bool InitStaticResources) -{ - *ppShaderResourceBinding = nullptr; - - if (GetResourceSignatureCount() != 1) - { - LOG_ERROR_MESSAGE("PipelineState::CreateShaderResourceBinding is only allowed for pipelines that use a single " - "resource signature. Use IPipelineResourceSignature::CreateShaderResourceBinding instead."); - return; - } - return GetResourceSignature(0)->CreateShaderResourceBinding(ppShaderResourceBinding, InitStaticResources); -} - -IShaderResourceVariable* PipelineStateVkImpl::GetStaticVariableByName(SHADER_TYPE ShaderType, - const Char* Name) -{ - if (GetResourceSignatureCount() != 1) - { - LOG_ERROR_MESSAGE("PipelineState::GetStaticVariableByName is only allowed for pipelines that use a single " - "resource signature. Use IPipelineResourceSignature::GetStaticVariableByName instead."); - return nullptr; - } - return GetResourceSignature(0)->GetStaticVariableByName(ShaderType, Name); -} - -IShaderResourceVariable* PipelineStateVkImpl::GetStaticVariableByIndex(SHADER_TYPE ShaderType, - Uint32 Index) -{ - if (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 GetResourceSignature(0)->GetStaticVariableByIndex(ShaderType, Index); -} - -Uint32 PipelineStateVkImpl::GetStaticVariableCount(SHADER_TYPE ShaderType) const -{ - if (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 GetResourceSignature(0)->GetStaticVariableCount(ShaderType); -} - -void PipelineStateVkImpl::BindStaticResources(Uint32 ShaderFlags, IResourceMapping* pResourceMapping, Uint32 Flags) -{ - if (GetResourceSignatureCount() != 1) - { - LOG_ERROR_MESSAGE("PipelineState::BindStaticResources is only allowed for pipelines that use a single " - "resource signature. Use IPipelineResourceSignature::BindStaticResources instead."); - return; - } - return GetResourceSignature(0)->BindStaticResources(ShaderFlags, pResourceMapping, Flags); -} - } // namespace Diligent -- cgit v1.2.3