diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-04-05 15:46:06 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-04-05 15:46:06 +0000 |
| commit | 9ab14b7d6e99129fcb9ec12f2693e50ab74d2b8c (patch) | |
| tree | 9c582457845f5cc2adaf6faf643010886f2695f6 /Graphics/GraphicsEngineVulkan | |
| parent | Replaced overloaded IPipelineState::GetStaticShaderVariable() with IPipelineS... (diff) | |
| download | DiligentCore-9ab14b7d6e99129fcb9ec12f2693e50ab74d2b8c.tar.gz DiligentCore-9ab14b7d6e99129fcb9ec12f2693e50ab74d2b8c.zip | |
Replaced overloaded IShaderResourceBinding::GetVariable() with IShaderResourceBinding::GetVariableByName() and IShaderResourceBinding::GetVariableByIndex()
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
3 files changed, 9 insertions, 9 deletions
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h index 5719a1e4..5c7b615c 100644 --- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h @@ -52,11 +52,11 @@ public: virtual void BindResources(Uint32 ShaderFlags, IResourceMapping* pResMapping, Uint32 Flags)override final; - virtual IShaderResourceVariable* GetVariable(SHADER_TYPE ShaderType, const char* Name)override final; + virtual IShaderResourceVariable* GetVariableByName(SHADER_TYPE ShaderType, const char* Name)override final; virtual Uint32 GetVariableCount(SHADER_TYPE ShaderType) const override final; - virtual IShaderResourceVariable* GetVariable(SHADER_TYPE ShaderType, Uint32 Index)override final; + virtual IShaderResourceVariable* GetVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index)override final; virtual void InitializeStaticResources(const IPipelineState* pPipelineState)override final; diff --git a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp index e989a98c..3f4a716c 100644 --- a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp +++ b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp @@ -208,13 +208,13 @@ namespace Diligent } const auto& ViewDesc = TexView.GetDesc(); - auto* pSrcMipVar = SRB.GetVariable(SHADER_TYPE_COMPUTE, "SrcMip"); + auto* pSrcMipVar = SRB.GetVariableByName(SHADER_TYPE_COMPUTE, "SrcMip"); IShaderResourceVariable* pOutMipVar[4] = { - SRB.GetVariable(SHADER_TYPE_COMPUTE, "OutMip0"), - SRB.GetVariable(SHADER_TYPE_COMPUTE, "OutMip1"), - SRB.GetVariable(SHADER_TYPE_COMPUTE, "OutMip2"), - SRB.GetVariable(SHADER_TYPE_COMPUTE, "OutMip3") + SRB.GetVariableByName(SHADER_TYPE_COMPUTE, "OutMip0"), + SRB.GetVariableByName(SHADER_TYPE_COMPUTE, "OutMip1"), + SRB.GetVariableByName(SHADER_TYPE_COMPUTE, "OutMip2"), + SRB.GetVariableByName(SHADER_TYPE_COMPUTE, "OutMip3") }; auto& PSOs = FindPSOs(ViewDesc.Format); diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp index 0193bb55..30e2ba8f 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp @@ -101,7 +101,7 @@ void ShaderResourceBindingVkImpl::BindResources(Uint32 ShaderFlags, IResourceMap } } -IShaderResourceVariable* ShaderResourceBindingVkImpl::GetVariable(SHADER_TYPE ShaderType, const char* Name) +IShaderResourceVariable* ShaderResourceBindingVkImpl::GetVariableByName(SHADER_TYPE ShaderType, const char* Name) { auto ShaderInd = GetShaderTypeIndex(ShaderType); auto ResLayoutInd = m_ResourceLayoutIndex[ShaderInd]; @@ -127,7 +127,7 @@ Uint32 ShaderResourceBindingVkImpl::GetVariableCount(SHADER_TYPE ShaderType) con return m_pShaderVarMgrs[ResLayoutInd].GetVariableCount(); } -IShaderResourceVariable* ShaderResourceBindingVkImpl::GetVariable(SHADER_TYPE ShaderType, Uint32 Index) +IShaderResourceVariable* ShaderResourceBindingVkImpl::GetVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) { auto ShaderInd = GetShaderTypeIndex(ShaderType); auto ResLayoutInd = m_ResourceLayoutIndex[ShaderInd]; |