diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-06-28 15:08:46 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-06-28 15:08:46 +0000 |
| commit | c985d342626ba289fc2db833ba482f3a40ae05b5 (patch) | |
| tree | dc14bd3eaeca7bdbf6169c5d85620adbe22722e6 /Graphics/GraphicsEngineVulkan | |
| parent | Only creating default SRB if pipeline state has static and no other resources... (diff) | |
| download | DiligentCore-c985d342626ba289fc2db833ba482f3a40ae05b5.tar.gz DiligentCore-c985d342626ba289fc2db833ba482f3a40ae05b5.zip | |
Unified implementation of IPipelineState::BindShaderResources()
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp | 17 |
2 files changed, 2 insertions, 19 deletions
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h index a96017e7..07e6da7b 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h @@ -55,9 +55,7 @@ public: virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject** ppInterface ); - virtual void BindShaderResources( IResourceMapping* pResourceMapping, Uint32 Flags )override; - - virtual void CreateShaderResourceBinding( IShaderResourceBinding **ppShaderResourceBinding )override; + virtual void CreateShaderResourceBinding( IShaderResourceBinding **ppShaderResourceBinding )override final; virtual bool IsCompatibleWith(const IPipelineState* pPSO)const override final; diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index 07bed5f2..9763e0e4 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -378,7 +378,7 @@ PipelineStateVkImpl :: PipelineStateVkImpl(IReferenceCounters* pRefCounters m_HasStaticResources = true; if (Layout.GetResourceCount(SHADER_VARIABLE_TYPE_MUTABLE) != 0 || - Layout.GetResourceCount(SHADER_VARIABLE_TYPE_DYNAMIC) != 0) + Layout.GetResourceCount(SHADER_VARIABLE_TYPE_DYNAMIC) != 0) m_HasNonStaticResources = true; } @@ -423,21 +423,6 @@ PipelineStateVkImpl::~PipelineStateVkImpl() IMPLEMENT_QUERY_INTERFACE( PipelineStateVkImpl, IID_PipelineStateVk, TPipelineStateBase ) -void PipelineStateVkImpl::BindShaderResources(IResourceMapping *pResourceMapping, Uint32 Flags) -{ - if ( m_Desc.IsComputePipeline ) - { - if (m_pCS)m_pCS->BindResources(pResourceMapping, Flags); - } - else - { - if (m_pVS)m_pVS->BindResources(pResourceMapping, Flags); - if (m_pPS)m_pPS->BindResources(pResourceMapping, Flags); - if (m_pGS)m_pGS->BindResources(pResourceMapping, Flags); - if (m_pDS)m_pDS->BindResources(pResourceMapping, Flags); - if (m_pHS)m_pHS->BindResources(pResourceMapping, Flags); - } -} void PipelineStateVkImpl::CreateShaderResourceBinding(IShaderResourceBinding **ppShaderResourceBinding) { |