diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-07-24 10:44:18 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2020-03-09 09:39:46 +0200 |
| commit | d2c5aa90e5489de96acc537c50230ce7fc33a2f4 (patch) | |
| tree | 5732457808b2e10e02e8aeceed36a791aa3a3552 | |
| parent | 70600c8c7dcf025a511c1cff7a11ddd5c52bfafa (diff) | |
Fix QShaderGenerator ES 3+ version declaration
The QShaderGenerator would use #version 300 es even if ES 3.1 or 3.2
was specified.
Change-Id: I2296ce8e01c732dd64dc1db40caeae83520bd3d3
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/gui/util/qshadergenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qshadergenerator.cpp b/src/gui/util/qshadergenerator.cpp index 1d47f51e84..76705153c9 100644 --- a/src/gui/util/qshadergenerator.cpp +++ b/src/gui/util/qshadergenerator.cpp @@ -302,7 +302,7 @@ QByteArray QShaderGenerator::createShaderCode(const QStringList &enabledLayers) const int minor = format.version().minorVersion(); const int version = major == 2 && isGLES ? 100 - : major == 3 && isGLES ? 300 + : major == 3 && isGLES ? 300 + (10 * minor) : major == 2 ? 100 + 10 * (minor + 1) : major == 3 && minor <= 2 ? 100 + 10 * (minor + 3) : major * 100 + minor * 10; |