diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 07:54:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 07:54:52 (GMT) |
| commit | ea7576eecacaaf5e82f5ebaf847dc9690baa9fca (patch) | |
| tree | 3eba16bc5c0c6a698f01892d2663fc7f516016bb /tests/manual | |
| parent | f7dde050b1f4ef31bf386f447c723ffd497058c7 (diff) | |
| parent | 7b0762c17f9899e68c0f67480a81b25c6f0c7dda (diff) | |
| download | Qt-ea7576eecacaaf5e82f5ebaf847dc9690baa9fca.zip Qt-ea7576eecacaaf5e82f5ebaf847dc9690baa9fca.tar.gz Qt-ea7576eecacaaf5e82f5ebaf847dc9690baa9fca.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
Fixed qmlshadersplugin on windows VC2008 toolchain.
Diffstat (limited to 'tests/manual')
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); } " |