summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/util/qshadergenerator
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2017-08-03 17:28:47 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-04 11:19:30 +0000
commitb6c3f55b932b28a7e4acdd5952a93e929b461b92 (patch)
tree59324386133fda99014d62865610cf174885f159 /tests/auto/gui/util/qshadergenerator
parentf2c6e10ad59c0660b772bff7715fb232cdbe394c (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 'tests/auto/gui/util/qshadergenerator')
-rw-r--r--tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
index 662373aea7..d0a0225055 100644
--- a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
+++ b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
@@ -220,7 +220,7 @@ void tst_QShaderGenerator::shouldGenerateShaderCode_data()
const auto openGL32 = createFormat(QShaderFormat::OpenGLCoreProfile, 3, 2);
const auto openGL4 = createFormat(QShaderFormat::OpenGLCoreProfile, 4, 0);
- const auto versionGLES2 = QByteArrayList() << "#version 100 es" << "";
+ const auto versionGLES2 = QByteArrayList() << "#version 100" << "";
const auto versionGL3 = QByteArrayList() << "#version 130" << "";
const auto versionGL32 = QByteArrayList() << "#version 150 core" << "";
const auto versionGL4 = QByteArrayList() << "#version 400 core" << "";
@@ -298,7 +298,7 @@ void tst_QShaderGenerator::shouldGenerateVersionCommands_data()
QTest::addColumn<QShaderFormat>("format");
QTest::addColumn<QByteArray>("version");
- QTest::newRow("GLES2") << createFormat(QShaderFormat::OpenGLES, 2, 0) << QByteArrayLiteral("#version 100 es");
+ QTest::newRow("GLES2") << createFormat(QShaderFormat::OpenGLES, 2, 0) << QByteArrayLiteral("#version 100");
QTest::newRow("GLES3") << createFormat(QShaderFormat::OpenGLES, 3, 0) << QByteArrayLiteral("#version 300 es");
QTest::newRow("GL20") << createFormat(QShaderFormat::OpenGLNoProfile, 2, 0) << QByteArrayLiteral("#version 110");
@@ -659,7 +659,7 @@ void tst_QShaderGenerator::shouldProcessLanguageQualifierAndTypeEnums_data()
<< " fragColor = v0;"
<< "}"
<< "").join("\n");
- const auto es2Code = (QByteArrayList() << "#version 100 es"
+ const auto es2Code = (QByteArrayList() << "#version 100"
<< ""
<< QStringLiteral("%1 highp %2 worldPosition;").arg(toGlsl(qualifierValue, es2))
.arg(toGlsl(typeValue))