summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2022-03-28 12:46:47 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-28 19:49:35 +0000
commitdee9e54f3b72551d80c7aa06609b170ceea615ce (patch)
treee60a40152d193d8231d0acb6669fd2ce56aeb1e8
parente05ba78535339bf4855e3b6b62e6bd150c0ae3fd (diff)
RHIShader: fix iterator mismatch
`uniformNamesIt` is iterating over `m_uniformsNames`, but `uniformNamesEnd` was erroneously an iterator over another vector. Change-Id: Iaa1f1ba3528a1699af32775606c596fba40fbd2a Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit ace82368253c6f64bc77dcf2a8cbca0425b658a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/renderers/rhi/renderer/rhishader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/renderers/rhi/renderer/rhishader.cpp b/src/plugins/renderers/rhi/renderer/rhishader.cpp
index 7ac40b2b0..5684e27ce 100644
--- a/src/plugins/renderers/rhi/renderer/rhishader.cpp
+++ b/src/plugins/renderers/rhi/renderer/rhishader.cpp
@@ -662,7 +662,7 @@ void RHIShader::initializeUniformBlocks(const std::vector<ShaderUniformBlock> &u
const std::vector<ShaderUniform>::const_iterator uniformsEnd = m_uniforms.cend();
std::vector<QString>::const_iterator uniformNamesIt = m_uniformsNames.cbegin();
- const std::vector<QString>::const_iterator uniformNamesEnd = m_attributesNames.cend();
+ const std::vector<QString>::const_iterator uniformNamesEnd = m_uniformsNames.cend();
QHash<QString, ShaderUniform> activeUniformsInBlock;