summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Niemelä <marko.a.niemela@nokia.com>2011-06-08 07:16:38 (GMT)
committerMarko Niemelä <marko.a.niemela@nokia.com>2011-06-08 07:16:38 (GMT)
commit7b0762c17f9899e68c0f67480a81b25c6f0c7dda (patch)
tree73e23d538d7f19017d1493217afb83394c9b37ee
parenta2f52802bd7183ecb2ac2ba967393f0781fa7126 (diff)
downloadQt-7b0762c17f9899e68c0f67480a81b25c6f0c7dda.zip
Qt-7b0762c17f9899e68c0f67480a81b25c6f0c7dda.tar.gz
Qt-7b0762c17f9899e68c0f67480a81b25c6f0c7dda.tar.bz2
Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
SGX GPU requires precision definitions for all variables. Additionally some unnecessary semicolons were removed. Reviewed-by: Kim Gronholm
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml2
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml4
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml2
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml2
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
index 3b94389..ec372ca 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
@@ -70,7 +70,7 @@ Rectangle {
uniform lowp sampler2D source;
varying highp vec2 qt_TexCoord0;
void main() {
- vec2 tex = qt_TexCoord0 * 4.0;
+ highp vec2 tex = qt_TexCoord0 * 4.0;
gl_FragColor = texture2D(source, tex);
}
"
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
index a7530dc..4edb065 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
@@ -67,7 +67,7 @@ Rectangle {
{
qt_TexCoord0 = qt_MultiTexCoord0;
gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
- };
+ }
"
property string dummyVertexShader: "
@@ -79,7 +79,7 @@ Rectangle {
{
qt_TexCoord0 = qt_MultiTexCoord0;
gl_Position = qt_Vertex * vec4(0.0, 0.0, 0.0, 0.0001);
- };
+ }
"
vertexShader: defaultVertexShader
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
index 726b237..b7d6db4 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
@@ -69,7 +69,7 @@ Rectangle {
uniform lowp sampler2D source;
varying highp vec2 qt_TexCoord0;
void main() {
- vec2 tex = qt_TexCoord0 * 4.0;
+ highp vec2 tex = qt_TexCoord0 * 4.0;
gl_FragColor = texture2D(source, tex);
}
"
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
index 514e150..e09673c 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
@@ -69,7 +69,7 @@ Rectangle {
uniform lowp sampler2D source;
varying highp vec2 qt_TexCoord0;
void main() {
- vec2 tex = qt_TexCoord0 * 4.0;
+ highp vec2 tex = qt_TexCoord0 * 4.0;
gl_FragColor = texture2D(source, tex);
}
"