1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QShaderGenerator ES 3+ version declaration

Browse Source 
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>
This commit is contained in:
Paul Lemire 2019-07-24 10:44:18 +02:00
parent 70600c8c7d
commit d2c5aa90e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/util/qshadergenerator.cpp
View File

@ -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;