From dee9e54f3b72551d80c7aa06609b170ceea615ce Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 28 Mar 2022 12:46:47 +0200 Subject: 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 (cherry picked from commit ace82368253c6f64bc77dcf2a8cbca0425b658a5) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/renderers/rhi/renderer/rhishader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 &u const std::vector::const_iterator uniformsEnd = m_uniforms.cend(); std::vector::const_iterator uniformNamesIt = m_uniformsNames.cbegin(); - const std::vector::const_iterator uniformNamesEnd = m_attributesNames.cend(); + const std::vector::const_iterator uniformNamesEnd = m_uniformsNames.cend(); QHash activeUniformsInBlock; -- cgit v1.2.3