14 files changed, 77 insertions, 18 deletions
diff --git a/tests/auto/quick/qquickshadereffect/data/+qsb/red.frag b/tests/auto/quick/qquickshadereffect/data/+qsb/red.frag
new file mode 100644
index 0000000000..695fa08edf
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/+qsb/red.frag
diff --git a/tests/auto/quick/qquickshadereffect/data/+qsb/test.frag b/tests/auto/quick/qquickshadereffect/data/+qsb/test.frag
new file mode 100644
index 0000000000..412221f896
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/+qsb/test.frag
diff --git a/tests/auto/quick/qquickshadereffect/data/+qsb/test.vert b/tests/auto/quick/qquickshadereffect/data/+qsb/test.vert
new file mode 100644
index 0000000000..b588ac26f6
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/+qsb/test.vert
diff --git a/tests/auto/quick/qquickshadereffect/data/MyIcon.qml b/tests/auto/quick/qquickshadereffect/data/MyIcon.qml
index eb788fce7a..0ed8f36580 100644
--- a/tests/auto/quick/qquickshadereffect/data/MyIcon.qml
+++ b/tests/auto/quick/qquickshadereffect/data/MyIcon.qml
@@ -76,11 +76,6 @@ Item {
 
         property Image source: visible ? image : null
 
-        fragmentShader: "
-            varying highp vec2 qt_TexCoord0;
-            uniform sampler2D source;
-            void main() {
-                gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-            }"
+        fragmentShader: "qrc:/data/red.frag"
     }
 }
diff --git a/tests/auto/quick/qquickshadereffect/data/compile.bat b/tests/auto/quick/qquickshadereffect/data/compile.bat
new file mode 100644
index 0000000000..6b276aea69
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/compile.bat
@@ -0,0 +1,4 @@
+qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/test.vert test_rhi.vert
+
+qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/red.frag red_rhi.frag
+qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/test.frag test_rhi.frag
diff --git a/tests/auto/quick/qquickshadereffect/data/connections.qml b/tests/auto/quick/qquickshadereffect/data/connections.qml
new file mode 100644
index 0000000000..6c0df4be6e
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/connections.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+import ShaderEffectTest 1.0
+
+TestShaderEffect {
+    width:100;
+    height:100;
+    fragmentShader: "qrc:/data/test.frag"
+    vertexShader: "qrc:/data/test.vert"
+}
diff --git a/tests/auto/quick/qquickshadereffect/data/deleteShaderEffectSource.qml b/tests/auto/quick/qquickshadereffect/data/deleteShaderEffectSource.qml
index ec455e53f8..95fdfee91a 100644
--- a/tests/auto/quick/qquickshadereffect/data/deleteShaderEffectSource.qml
+++ b/tests/auto/quick/qquickshadereffect/data/deleteShaderEffectSource.qml
@@ -51,11 +51,6 @@ Rectangle {
         sei.source = doomed;
         doomed.destroy();
         // now set a fragment shader to trigger source texture detection.
-        sei.fragmentShader = "varying highp vec2 qt_TexCoord0;\
-                              uniform sampler2D source;\
-                              uniform lowp float qt_Opacity;\
-                              void main() {\
-                                  gl_FragColor = texture2D(source, qt_TexCoord0) * qt_Opacity;\
-                              }";
+        sei.fragmentShader = "qrc:/data/test.frag";
     }
 }
diff --git a/tests/auto/quick/qquickshadereffect/data/deleteSourceItem.qml b/tests/auto/quick/qquickshadereffect/data/deleteSourceItem.qml
index 8fb9de0a33..9257e9a01a 100644
--- a/tests/auto/quick/qquickshadereffect/data/deleteSourceItem.qml
+++ b/tests/auto/quick/qquickshadereffect/data/deleteSourceItem.qml
@@ -52,11 +52,6 @@ Rectangle {
         doomed.destroy();
         sei.source = doomedses;
         // now set a fragment shader to trigger source texture detection.
-        sei.fragmentShader = "varying highp vec2 qt_TexCoord0;\
-                              uniform sampler2D source;\
-                              uniform lowp float qt_Opacity;\
-                              void main() {\
-                                  gl_FragColor = texture2D(source, qt_TexCoord0) * qt_Opacity;\
-                              }";
+        sei.fragmentShader = "qrc:/data/test.frag";
     }
 }
diff --git a/tests/auto/quick/qquickshadereffect/data/red.frag b/tests/auto/quick/qquickshadereffect/data/red.frag
new file mode 100644
index 0000000000..08e3ddcd89
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/red.frag
@@ -0,0 +1,6 @@
+
+varying highp vec2 qt_TexCoord0;
+uniform sampler2D source;
+void main() {
+    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}
diff --git a/tests/auto/quick/qquickshadereffect/data/red_rhi.frag b/tests/auto/quick/qquickshadereffect/data/red_rhi.frag
new file mode 100644
index 0000000000..d08a5db205
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/red_rhi.frag
@@ -0,0 +1,10 @@
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
+void main() {
+    fragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}
diff --git a/tests/auto/quick/qquickshadereffect/data/test.frag b/tests/auto/quick/qquickshadereffect/data/test.frag
new file mode 100644
index 0000000000..79fa094f9d
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/test.frag
@@ -0,0 +1,6 @@
+varying highp vec2 qt_TexCoord0;
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+void main() {
+    gl_FragColor = texture2D(source, qt_TexCoord0) * qt_Opacity;
+}
diff --git a/tests/auto/quick/qquickshadereffect/data/test.vert b/tests/auto/quick/qquickshadereffect/data/test.vert
new file mode 100644
index 0000000000..5d7118cfb1
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/test.vert
@@ -0,0 +1,8 @@
+uniform highp mat4 qt_Matrix;
+attribute highp vec4 qt_Vertex;
+attribute highp vec2 qt_MultiTexCoord0;
+varying highp vec2 qt_TexCoord0;
+void main() {
+    qt_TexCoord0 = qt_MultiTexCoord0;
+    gl_Position = qt_Matrix * qt_Vertex;
+}
diff --git a/tests/auto/quick/qquickshadereffect/data/test_rhi.frag b/tests/auto/quick/qquickshadereffect/data/test_rhi.frag
new file mode 100644
index 0000000000..bd60894b65
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/test_rhi.frag
@@ -0,0 +1,15 @@
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+} ubuf;
+
+void main() {
+    fragColor = texture(source, qt_TexCoord0) * ubuf.qt_Opacity;
+}
diff --git a/tests/auto/quick/qquickshadereffect/data/test_rhi.vert b/tests/auto/quick/qquickshadereffect/data/test_rhi.vert
new file mode 100644
index 0000000000..59a98fa813
--- /dev/null
+++ b/tests/auto/quick/qquickshadereffect/data/test_rhi.vert
@@ -0,0 +1,16 @@
+#version 440
+
+layout(location = 0) in vec4 qt_Vertex;
+layout(location = 1) in vec2 qt_MultiTexCoord0;
+
+layout(location = 0) out vec2 qt_TexCoord0;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+} ubuf;
+
+void main() {
+    qt_TexCoord0 = qt_MultiTexCoord0;
+    gl_Position = ubuf.qt_Matrix * qt_Vertex;
+}