diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-04-05 15:28:29 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-04-05 15:28:29 +0000 |
| commit | 06a38ea982ed1856d6fb9c143068ee8c68f59cef (patch) | |
| tree | 680565d999d684f1d8bf51974208bc3df8b26a47 /Graphics/GraphicsEngineD3D12 | |
| parent | Implemented staging textures in Vk backend (diff) | |
| download | DiligentCore-06a38ea982ed1856d6fb9c143068ee8c68f59cef.tar.gz DiligentCore-06a38ea982ed1856d6fb9c143068ee8c68f59cef.zip | |
Replaced overloaded IPipelineState::GetStaticShaderVariable() with IPipelineState::GetStaticVariableByName() and IPipelineState::GetStaticVariableByIndex() (closed https://github.com/DiligentGraphics/DiligentCore/issues/82).
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h index fa51b6d0..079978b6 100644 --- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h @@ -54,9 +54,9 @@ public: virtual Uint32 GetStaticVariableCount(SHADER_TYPE ShaderType) const override final; - virtual IShaderResourceVariable* GetStaticShaderVariable(SHADER_TYPE ShaderType, const Char* Name) override final; + virtual IShaderResourceVariable* GetStaticVariableByName(SHADER_TYPE ShaderType, const Char* Name) override final; - virtual IShaderResourceVariable* GetStaticShaderVariable(SHADER_TYPE ShaderType, Uint32 Index) override final; + virtual IShaderResourceVariable* GetStaticVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final; virtual void CreateShaderResourceBinding( IShaderResourceBinding **ppShaderResourceBinding, bool InitStaticResources )override final; diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index d1f015f3..ac065da6 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -462,7 +462,7 @@ Uint32 PipelineStateD3D12Impl::GetStaticVariableCount(SHADER_TYPE ShaderType) co return m_pStaticVarManagers[LayoutInd].GetVariableCount(); } -IShaderResourceVariable* PipelineStateD3D12Impl::GetStaticShaderVariable(SHADER_TYPE ShaderType, const Char* Name) +IShaderResourceVariable* PipelineStateD3D12Impl::GetStaticVariableByName(SHADER_TYPE ShaderType, const Char* Name) { const auto LayoutInd = m_ResourceLayoutIndex[GetShaderTypeIndex(ShaderType)]; if (LayoutInd < 0) @@ -471,7 +471,7 @@ IShaderResourceVariable* PipelineStateD3D12Impl::GetStaticShaderVariable(SHADER_ return m_pStaticVarManagers[LayoutInd].GetVariable(Name); } -IShaderResourceVariable* PipelineStateD3D12Impl::GetStaticShaderVariable(SHADER_TYPE ShaderType, Uint32 Index) +IShaderResourceVariable* PipelineStateD3D12Impl::GetStaticVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) { const auto LayoutInd = m_ResourceLayoutIndex[GetShaderTypeIndex(ShaderType)]; if (LayoutInd < 0) |