diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-08-03 17:28:47 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-04 11:19:30 +0000 |
| commit | b6c3f55b932b28a7e4acdd5952a93e929b461b92 (patch) | |
| tree | 59324386133fda99014d62865610cf174885f159 /src/gui | |
| parent | f2c6e10ad59c0660b772bff7715fb232cdbe394c (diff) | |
GLSL 1.00 ES must be selected using "#version 100"
I was mistaken before, the "es" part for that version isn't optional, it
*must* be omitted.
Change-Id: I9e83d2317523fb0a905e40b95a56033cf693b93b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/gui')
| -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 7d16448647..31c2f74746 100644 --- a/src/gui/util/qshadergenerator.cpp +++ b/src/gui/util/qshadergenerator.cpp @@ -294,7 +294,7 @@ QByteArray QShaderGenerator::createShaderCode(const QStringList &enabledLayers) : major == 3 && minor <= 2 ? 100 + 10 * (minor + 3) : major * 100 + minor * 10; - const auto profile = isGLES ? QByteArrayLiteral(" es") + const auto profile = isGLES && version > 100 ? QByteArrayLiteral(" es") : version >= 150 && format.api() == QShaderFormat::OpenGLCoreProfile ? QByteArrayLiteral(" core") : version >= 150 && format.api() == QShaderFormat::OpenGLCompatibilityProfile ? QByteArrayLiteral(" compatibility") : QByteArray(); |