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/GraphicsEngineVulkan | |
| 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/GraphicsEngineVulkan')
3 files changed, 5 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h index e9be63a3..d63279bd 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h @@ -70,9 +70,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; void CommitAndTransitionShaderResources(IShaderResourceBinding* pShaderResourceBinding, DeviceContextVkImpl* pCtxVkImpl, diff --git a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp index 4282b578..e989a98c 100644 --- a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp +++ b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp @@ -157,7 +157,7 @@ namespace Diligent PSODesc.ResourceLayout.NumStaticSamplers = 1; m_DeviceVkImpl.CreatePipelineState(PSODesc, &PSOs[NonPowOfTwo]); - PSOs[NonPowOfTwo]->GetStaticShaderVariable(SHADER_TYPE_COMPUTE, "CB")->Set(m_ConstantsCB); + PSOs[NonPowOfTwo]->GetStaticVariableByName(SHADER_TYPE_COMPUTE, "CB")->Set(m_ConstantsCB); } return PSOs; diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index 776db721..b4be5e89 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -641,7 +641,7 @@ Uint32 PipelineStateVkImpl::GetStaticVariableCount(SHADER_TYPE ShaderType) const return StaticVarMgr.GetVariableCount(); } -IShaderResourceVariable* PipelineStateVkImpl::GetStaticShaderVariable(SHADER_TYPE ShaderType, const Char* Name) +IShaderResourceVariable* PipelineStateVkImpl::GetStaticVariableByName(SHADER_TYPE ShaderType, const Char* Name) { const auto LayoutInd = m_ResourceLayoutIndex[GetShaderTypeIndex(ShaderType)]; if (LayoutInd < 0) @@ -651,7 +651,7 @@ IShaderResourceVariable* PipelineStateVkImpl::GetStaticShaderVariable(SHADER_TYP return StaticVarMgr.GetVariable(Name); } -IShaderResourceVariable* PipelineStateVkImpl::GetStaticShaderVariable(SHADER_TYPE ShaderType, Uint32 Index) +IShaderResourceVariable* PipelineStateVkImpl::GetStaticVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) { const auto LayoutInd = m_ResourceLayoutIndex[GetShaderTypeIndex(ShaderType)]; if (LayoutInd < 0) |