diff options
| author | Michael Brasser <mbrasser@ford.com> | 2020-10-21 08:39:00 -0500 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-10-23 14:31:29 +0000 |
| commit | 21fa917f99350465129bf4a3c78e8b3f734ac175 (patch) | |
| tree | 93c1ac57213e40e3dbea8a499aea7cc2ef0e9f31 | |
| parent | 4fed1c60dbed61c78ac80d608b840a6043cf7303 (diff) | |
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 <paul.lemire@kdab.com>
(cherry picked from commit f852aa731e3fdc79a4045425bc424fbbd3a4e50a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/render/shadergraph/qshaderformat.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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; |