diff options
| author | Mauro Persano <mauro.persano@kdab.com> | 2021-05-03 10:20:47 -0300 |
|---|---|---|
| committer | Mauro Persano <mauro.persano@kdab.com> | 2021-05-04 11:35:00 +0000 |
| commit | e5276cd4cdc6b7b2e37c14e6983eaf4ce31b5a1c (patch) | |
| tree | fe8997c1ed3bfdded7f9ba51ae5d28ced950645f /src | |
| parent | 09c04d4078e0304ccc7d6dad327be10458d4e2a8 (diff) | |
QShaderNode: use rule with highest version number
Pick the supported rule with highest version number. For instance, if
we're looking for a rule for OpenGL ES 3.2, and there's a rule for ES
2.0 and another one for ES 3.0, make sure the rule for ES 3 is
selected.
Pick-to: 6.1 5.15
Change-Id: Ie517206948bc0422f6254472de43cda4dd2ce982
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/render/shadergraph/qshadernode.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/render/shadergraph/qshadernode.cpp b/src/render/shadergraph/qshadernode.cpp index aa4a101c2..b95a77b04 100644 --- a/src/render/shadergraph/qshadernode.cpp +++ b/src/render/shadergraph/qshadernode.cpp @@ -152,11 +152,14 @@ QList<QShaderFormat> QShaderNode::availableFormats() const QShaderNode::Rule QShaderNode::rule(const QShaderFormat &format) const { - const auto it = std::find_if(m_rules.crbegin(), m_rules.crend(), - [format](const QPair<QShaderFormat, Rule> &entry) { - return format.supports(entry.first); - }); - return it != m_rules.crend() ? it->second : Rule(); + const QPair<QShaderFormat, Rule> *selected = nullptr; + for (const auto &entry : qAsConst(m_rules)) { + if (format.supports(entry.first)) { + if (!selected || entry.first.version() > selected->first.version()) + selected = &entry; + } + } + return selected ? selected->second : Rule(); } QShaderNode::Rule::Rule(const QByteArray &subs, const QByteArrayList &snippets) noexcept |