Update ShaderBuilder tests following changes in QShaderGenerator

Change-Id: Ia047e79bcb2ecb7da3438c4cb4980377dc20744e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 3 insertions, 19 deletions

diff --git a/tests/auto/render/shaderbuilder/output.es2 b/tests/auto/render/shaderbuilder/output.es2
index b543bc5ee..0298e7e51 100644
--- a/tests/auto/render/shaderbuilder/output.es2
+++ b/tests/auto/render/shaderbuilder/output.es2
@@ -24,13 +24,5 @@ highp vec4 lightModel(const in highp vec3 baseColor,
 
 void main()
 {
-    highp vec2 v2 = texCoord;
-    sampler2D v1 = texture;
-    highp float v3 = lightIntensity;
-    highp vec4 v5 = texture2D(v1, v2);
-    highp vec3 v0 = worldPosition;
-    highp float v4 = exposure;
-    highp vec4 v6 = lightModel(v5, v0, v3);
-    highp vec4 v7 = v6 * pow(2.0, v4);
-    gl_fragColor = v7;
+    gl_fragColor = (((((lightModel(((texture2D(texture, texCoord))), worldPosition, lightIntensity)))) * pow(2.0, exposure)));
 }
diff --git a/tests/auto/render/shaderbuilder/output.gl3 b/tests/auto/render/shaderbuilder/output.gl3
index 95a9c53fd..4c9fd1064 100644
--- a/tests/auto/render/shaderbuilder/output.gl3
+++ b/tests/auto/render/shaderbuilder/output.gl3
@@ -25,13 +25,5 @@ vec4 lightModel(const in vec3 baseColor,
 
 void main()
 {
-    vec2 v2 = texCoord;
-    sampler2D v1 = texture;
-    float v3 = lightIntensity;
-    vec4 v5 = texture2D(v1, v2);
-    vec3 v0 = worldPosition;
-    float v4 = exposure;
-    vec4 v6 = lightModel(v5, v0, v3);
-    vec4 v7 = v6 * pow(2.0, v4);
-    fragColor = v7;
+    fragColor = (((((lightModel(((texture2D(texture, texCoord))), worldPosition, lightIntensity)))) * pow(2.0, exposure)));
 }
diff --git a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
index fa768a859..d8c32edc4 100644
--- a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
+++ b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
@@ -540,7 +540,7 @@ private slots:
         // THEN
         QCOMPARE(backend.shaderGraph(type), graphUrl);
         QVERIFY(!backend.isShaderCodeDirty(type));
-//        QCOMPARE(backend.shaderCode(type), es2Code);
+        QCOMPARE(backend.shaderCode(type), es2Code);
     }
 };