diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-09-18 05:18:20 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-09-18 05:18:20 +0000 |
| commit | 079a419d17100306c436a14a93eccf156ba08b7d (patch) | |
| tree | 7abd44e6f40cc4f764409f3e25c49b42c133d776 /Graphics/GraphicsEngine | |
| parent | Refactored internal shader resouce variable indexing (diff) | |
| download | DiligentCore-079a419d17100306c436a14a93eccf156ba08b7d.tar.gz DiligentCore-079a419d17100306c436a14a93eccf156ba08b7d.zip | |
Fixed gcc/clang error
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/PipelineStateBase.hpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp index 91cf912c..b54a2f76 100644 --- a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp +++ b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp @@ -454,19 +454,19 @@ protected: protected: Int8 GetStaticVariableCountHelper(SHADER_TYPE ShaderType, const std::array<Int8, MAX_SHADERS_IN_PIPELINE>& ResourceLayoutIndex) const { - if (!IsConsistentShaderType(ShaderType, m_Desc.PipelineType)) + if (!IsConsistentShaderType(ShaderType, this->m_Desc.PipelineType)) { LOG_WARNING_MESSAGE("Unable to get the number of static variables in shader stage ", GetShaderTypeLiteralName(ShaderType), - " as the stage is invalid for ", GetPipelineTypeString(m_Desc.PipelineType), " pipeline '", m_Desc.Name, "'"); + " as the stage is invalid for ", GetPipelineTypeString(this->m_Desc.PipelineType), " pipeline '", this->m_Desc.Name, "'"); return -1; } - const auto ShaderTypeInd = GetShaderTypePipelineIndex(ShaderType, m_Desc.PipelineType); + const auto ShaderTypeInd = GetShaderTypePipelineIndex(ShaderType, this->m_Desc.PipelineType); const auto LayoutInd = ResourceLayoutIndex[ShaderTypeInd]; if (LayoutInd < 0) { LOG_WARNING_MESSAGE("Unable to get the number of static variables in shader stage ", GetShaderTypeLiteralName(ShaderType), - " as the stage is inactive in PSO '", m_Desc.Name, "'"); + " as the stage is inactive in PSO '", this->m_Desc.Name, "'"); } return LayoutInd; @@ -474,19 +474,19 @@ protected: Int8 GetStaticVariableByNameHelper(SHADER_TYPE ShaderType, const Char* Name, const std::array<Int8, MAX_SHADERS_IN_PIPELINE>& ResourceLayoutIndex) const { - if (!IsConsistentShaderType(ShaderType, m_Desc.PipelineType)) + if (!IsConsistentShaderType(ShaderType, this->m_Desc.PipelineType)) { LOG_WARNING_MESSAGE("Unable to find static variable '", Name, "' in shader stage ", GetShaderTypeLiteralName(ShaderType), - " as the stage is invalid for ", GetPipelineTypeString(m_Desc.PipelineType), " pipeline '", m_Desc.Name, "'"); + " as the stage is invalid for ", GetPipelineTypeString(this->m_Desc.PipelineType), " pipeline '", this->m_Desc.Name, "'"); return -1; } - const auto ShaderTypeInd = GetShaderTypePipelineIndex(ShaderType, m_Desc.PipelineType); + const auto ShaderTypeInd = GetShaderTypePipelineIndex(ShaderType, this->m_Desc.PipelineType); const auto LayoutInd = ResourceLayoutIndex[ShaderTypeInd]; if (LayoutInd < 0) { LOG_WARNING_MESSAGE("Unable to find static variable '", Name, "' in shader stage ", GetShaderTypeLiteralName(ShaderType), - " as the stage is inactive in PSO '", m_Desc.Name, "'"); + " as the stage is inactive in PSO '", this->m_Desc.Name, "'"); } return LayoutInd; @@ -494,19 +494,19 @@ protected: Int8 GetStaticVariableByIndexHelper(SHADER_TYPE ShaderType, Uint32 Index, const std::array<Int8, MAX_SHADERS_IN_PIPELINE>& ResourceLayoutIndex) const { - if (!IsConsistentShaderType(ShaderType, m_Desc.PipelineType)) + if (!IsConsistentShaderType(ShaderType, this->m_Desc.PipelineType)) { LOG_WARNING_MESSAGE("Unable to get static variable at index ", Index, " in shader stage ", GetShaderTypeLiteralName(ShaderType), - " as the stage is invalid for ", GetPipelineTypeString(m_Desc.PipelineType), " pipeline '", m_Desc.Name, "'"); + " as the stage is invalid for ", GetPipelineTypeString(this->m_Desc.PipelineType), " pipeline '", this->m_Desc.Name, "'"); return -1; } - const auto ShaderTypeInd = GetShaderTypePipelineIndex(ShaderType, m_Desc.PipelineType); + const auto ShaderTypeInd = GetShaderTypePipelineIndex(ShaderType, this->m_Desc.PipelineType); const auto LayoutInd = ResourceLayoutIndex[ShaderTypeInd]; if (LayoutInd < 0) { LOG_WARNING_MESSAGE("Unable to get static variable at index ", Index, " in shader stage ", GetShaderTypeLiteralName(ShaderType), - " as the stage is inactive in PSO '", m_Desc.Name, "'"); + " as the stage is inactive in PSO '", this->m_Desc.Name, "'"); } return LayoutInd; |