From 21168905a7eda8806543b490a0fae5a5a0ec7cad Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Thu, 29 Jul 2021 12:45:16 +0200 Subject: Fix for QShaderNode fix that selected highest version number of a rule The rule selection still has to be made from last added rule to first so that format.support works correctly. - Update QShaderNode unit tests Pick-to: 6.2 6.1 5.15 Change-Id: I47af898ee0d82e91009efccf1dca9937feaca717 Reviewed-by: Mike Krus --- src/render/shadergraph/qshadernode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/render/shadergraph/qshadernode.cpp b/src/render/shadergraph/qshadernode.cpp index b95a77b04..b06b9c84e 100644 --- a/src/render/shadergraph/qshadernode.cpp +++ b/src/render/shadergraph/qshadernode.cpp @@ -153,7 +153,8 @@ QList QShaderNode::availableFormats() const QShaderNode::Rule QShaderNode::rule(const QShaderFormat &format) const { const QPair *selected = nullptr; - for (const auto &entry : qAsConst(m_rules)) { + for (auto it = m_rules.crbegin(); it != m_rules.crend(); ++it) { + const auto &entry = *it; if (format.supports(entry.first)) { if (!selected || entry.first.version() > selected->first.version()) selected = &entry; -- cgit v1.2.3