Further RHI adaptation of shaders in lancelot test scenes

In the recent commit that added RHI shaders, a couple of the test
scenes were overlooked.

The attributes.qml test file is simply removed as it adds no
significant test coverage.

Change-Id: Ic3af7b4447da322323f67faa1cf93c160c5043e8
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

2 files changed, 1 insertions, 73 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/attributes.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/attributes.qml
deleted file mode 100644
index 17d9aadf95..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/attributes.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    width: 320
-    height: 480
-
-    Text {
-        id: text
-        font.pixelSize:  80
-        text: "Shaderz!"
-    }
-
-    ShaderEffectSource {
-        id: source
-        sourceItem: text
-        hideSource: true
-        smooth: true
-    }
-    Column {
-        ShaderEffect {
-            width: 320
-            height: 160
-            property variant source: source
-            vertexShader: "
-                uniform highp mat4 qt_Matrix;
-                attribute highp vec4 qt_Vertex;
-                attribute highp vec2 qt_MultiTexCoord0;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    gl_Position = qt_Matrix * qt_Vertex;
-                    qt_TexCoord0 = qt_MultiTexCoord0;
-                }"
-        }
-        ShaderEffect {
-            width: 320
-            height: 160
-            property variant source: source
-            vertexShader: "
-                attribute highp vec2 qt_MultiTexCoord0;
-                uniform highp mat4 qt_Matrix;
-                attribute highp vec4 qt_Vertex;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    gl_Position = qt_Matrix * qt_Vertex;
-                    qt_TexCoord0 = qt_MultiTexCoord0;
-                }"
-        }
-        ShaderEffect {
-            width: 320
-            height: 160
-            property variant source: source
-            vertexShader: "
-                attribute highp vec2 qt_MultiTexCoord0;
-                uniform highp mat4 qt_Matrix;
-                attribute highp vec4 qt_Vertex;
-                varying highp vec2 qt_TexCoord0;
-                uniform highp float width;
-                uniform highp float height;
-                void main() {
-                    gl_Position = qt_Matrix * qt_Vertex;
-                    qt_TexCoord0 = qt_Vertex.xy / vec2(width, height);
-                }"
-        }
-    }
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
index 0d3c1fc4ee..c02dfba9e2 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
@@ -47,14 +47,7 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "
-        uniform lowp sampler2D source;
-        varying highp vec2 qt_TexCoord0;
-        uniform lowp float qt_Opacity;
-        void main() {
-            gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a;
-        }
-        "
+        fragmentShader: "qrc:shaders/gradient.frag"
     }