From 7b0762c17f9899e68c0f67480a81b25c6f0c7dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Niemel=C3=A4?= Date: Wed, 8 Jun 2011 10:16:38 +0300 Subject: 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 --- .../qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml | 2 +- .../qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml | 4 ++-- .../qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml | 2 +- .../qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml | 2 +- 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); } " -- cgit v0.12