From: Ian Romanick <[email protected]>
Signed-off-by: Ian Romanick <[email protected]>
Cc: Matt Turner <[email protected]>
---
.../execution/const-var-non-constant-expr.shader_test | 10 ++--------
.../execution/implicit-return-type-conversion.shader_test | 10 ++--------
.../execution/length-matrix.shader_test | 10 ++--------
.../execution/length-vector.shader_test | 10 ++--------
.../execution/scalar-swizzle.shader_test | 10 ++--------
5 files changed, 10 insertions(+), 40 deletions(-)
diff --git
a/tests/spec/arb_shading_language_420pack/execution/const-var-non-constant-expr.shader_test
b/tests/spec/arb_shading_language_420pack/execution/const-var-non-constant-expr.shader_test
index f0fac63..84edd5b 100644
---
a/tests/spec/arb_shading_language_420pack/execution/const-var-non-constant-expr.shader_test
+++
b/tests/spec/arb_shading_language_420pack/execution/const-var-non-constant-expr.shader_test
@@ -16,13 +16,7 @@
GLSL >= 1.30
GL_ARB_shading_language_420pack
-[vertex shader]
-attribute vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_shading_language_420pack: enable
@@ -35,7 +29,7 @@ void main() {
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git
a/tests/spec/arb_shading_language_420pack/execution/implicit-return-type-conversion.shader_test
b/tests/spec/arb_shading_language_420pack/execution/implicit-return-type-conversion.shader_test
index d2499b5..2c71c20 100644
---
a/tests/spec/arb_shading_language_420pack/execution/implicit-return-type-conversion.shader_test
+++
b/tests/spec/arb_shading_language_420pack/execution/implicit-return-type-conversion.shader_test
@@ -13,13 +13,7 @@
GLSL >= 1.30
GL_ARB_shading_language_420pack
-[vertex shader]
-attribute vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_shading_language_420pack: enable
@@ -31,7 +25,7 @@ void main() {
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git
a/tests/spec/arb_shading_language_420pack/execution/length-matrix.shader_test
b/tests/spec/arb_shading_language_420pack/execution/length-matrix.shader_test
index c1cb189..54b9bc6 100644
---
a/tests/spec/arb_shading_language_420pack/execution/length-matrix.shader_test
+++
b/tests/spec/arb_shading_language_420pack/execution/length-matrix.shader_test
@@ -17,13 +17,7 @@
GLSL >= 1.30
GL_ARB_shading_language_420pack
-[vertex shader]
-attribute vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_shading_language_420pack: enable
@@ -55,7 +49,7 @@ void main() {
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git
a/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test
b/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test
index 0e9e231..4d4ebe6 100644
---
a/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test
+++
b/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test
@@ -17,13 +17,7 @@
GLSL >= 1.30
GL_ARB_shading_language_420pack
-[vertex shader]
-attribute vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_shading_language_420pack: enable
@@ -43,7 +37,7 @@ void main() {
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git
a/tests/spec/arb_shading_language_420pack/execution/scalar-swizzle.shader_test
b/tests/spec/arb_shading_language_420pack/execution/scalar-swizzle.shader_test
index 1c632ad..2253f4f 100644
---
a/tests/spec/arb_shading_language_420pack/execution/scalar-swizzle.shader_test
+++
b/tests/spec/arb_shading_language_420pack/execution/scalar-swizzle.shader_test
@@ -17,13 +17,7 @@
GLSL >= 1.30
GL_ARB_shading_language_420pack
-[vertex shader]
-attribute vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#extension GL_ARB_shading_language_420pack: enable
@@ -35,7 +29,7 @@ void main() {
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
--
1.8.1.4
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
