From 21fa917f99350465129bf4a3c78e8b3f734ac175 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 21 Oct 2020 08:39:00 -0500 Subject: Update QShaderFormat matching logic to account for RHI shader snippets OpenGLCompatibility/NoProfile should not match RHI shader snippets. Task-number: QTBUG-85018 Change-Id: Id56656c7d6d64884092595d125e8f65178e5b9f8 Reviewed-by: Paul Lemire (cherry picked from commit f852aa731e3fdc79a4045425bc424fbbd3a4e50a) Reviewed-by: Qt Cherry-pick Bot --- src/render/shadergraph/qshaderformat.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/render/shadergraph/qshaderformat.cpp b/src/render/shadergraph/qshaderformat.cpp index 98643fb24..81077b6f5 100644 --- a/src/render/shadergraph/qshaderformat.cpp +++ b/src/render/shadergraph/qshaderformat.cpp @@ -105,6 +105,9 @@ bool QShaderFormat::supports(const QShaderFormat &other) const noexcept if (m_api == OpenGLCoreProfile && m_api != other.m_api) return false; + if (m_api < VulkanFlavoredGLSL && other.m_api >= VulkanFlavoredGLSL) + return false; + if (m_version < other.m_version) return false; -- cgit v1.2.3