From bdbca67b0e03baec3b9dd803e803d267210e892b Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Mon, 4 Mar 2019 23:19:07 -0800
Subject: Added ShaderFlags parameter to IPipelineState::BindStaticResources

---
 Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h    | 2 +-
 Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h | 2 ++
 Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp      | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'Graphics/GraphicsEngineD3D12')

diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h
index 64dfdc2b..fa51b6d0 100644
--- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h
@@ -50,7 +50,7 @@ public:
 
     virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface)override final;
    
-    virtual void BindStaticResources(IResourceMapping* pResourceMapping, Uint32 Flags)override final;
+    virtual void BindStaticResources(Uint32 ShaderFlags, IResourceMapping* pResourceMapping, Uint32 Flags)override final;
 
     virtual Uint32 GetStaticVariableCount(SHADER_TYPE ShaderType) const override final;
 
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h
index 26ed260e..35ddfbc7 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h
@@ -252,6 +252,8 @@ public:
     }
 
     const bool IsUsingSeparateSamplers() const {return !m_pResources->IsUsingCombinedTextureSamplers();}
+    
+    SHADER_TYPE GetShaderType() const {return m_pResources->GetShaderType();}
 
 private:
     const D3D12Resource& GetAssignedSampler(const D3D12Resource& TexSrv)const;
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
index 91835158..46530860 100644
--- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
@@ -442,11 +442,13 @@ bool PipelineStateD3D12Impl::dbgContainsShaderResources()const
     return false;
 }
 
-void PipelineStateD3D12Impl::BindStaticResources(IResourceMapping* pResourceMapping, Uint32 Flags)
+void PipelineStateD3D12Impl::BindStaticResources(Uint32 ShaderFlags, IResourceMapping* pResourceMapping, Uint32 Flags)
 {
     for (Uint32 s=0; s < m_NumShaders; ++s)
     {
-        m_pStaticVarManagers[s].BindResources(pResourceMapping, Flags);
+        auto ShaderType = GetStaticShaderResLayout(s).GetShaderType();
+        if ((ShaderFlags & ShaderType) != 0)
+            m_pStaticVarManagers[s].BindResources(pResourceMapping, Flags);
     }
 }
 
-- 
cgit v1.2.3