summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@qt.io>2018-06-07 11:27:40 +0300
committerJanne Koskinen <janne.p.koskinen@qt.io>2018-06-07 10:44:05 +0000
commitb706a87595e471c63220f45fb9df8a00d988acc1 (patch)
tree29b2be8d75265388e83e2df49e2bb383180d87b6
parentf1b8ce3893ac6897f3651f539763a4f89b930405 (diff)
Fix shader compilation on some ES GLSL compilers
Move standard derivatives extension to ES 2.0 path. Task-number: QT3DS-1896 Change-Id: I08763071bd825788a885685cf5f0a8fc888a34ac Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r--src/runtime/shadergenerator/q3dsshaderprogramgenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/shadergenerator/q3dsshaderprogramgenerator.cpp b/src/runtime/shadergenerator/q3dsshaderprogramgenerator.cpp
index 785644b..f3ab40b 100644
--- a/src/runtime/shadergenerator/q3dsshaderprogramgenerator.cpp
+++ b/src/runtime/shadergenerator/q3dsshaderprogramgenerator.cpp
@@ -265,10 +265,10 @@ public:
output.append(getVersionString(gfxLimits.format));
if (isOpenGLES) {
- // TODO: check if this is portable:
- output.append(QLatin1String("#extension GL_OES_standard_derivatives : enable\n"));
if (gfxLimits.format.majorVersion() == 2) {
// ES2
+ output.append(QLatin1String("#extension GL_OES_standard_derivatives : enable\n"));
+
output.append(QLatin1String("#define GLSL_100 1\n"));
output.append(QLatin1String("#define GLSL_130 0\n"));
if (m_stage == Q3DSShaderGeneratorStages::Enum::Fragment) {