[Piglit] [PATCH 13/13] arb_shading_language_420pack: Modify tests to use draw rect
Ian Romanick
idr at freedesktop.org
Tue Aug 27 18:45:56 PDT 2013
From: Ian Romanick <ian.d.romanick at intel.com>
Now that "draw rect" works in core profiles, use it!
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>
Cc: Matt Turner <mattst88 at gmail.com>
---
.../execution/aggregate-initializer-matrix.shader_test | 9 +--------
.../execution/aggregate-initializer-sized-array.shader_test | 9 +--------
.../execution/aggregate-initializer-struct.shader_test | 9 +--------
.../execution/aggregate-initializer-unsized-array.shader_test | 9 +--------
.../execution/const-var-non-constant-expr.shader_test | 9 +--------
.../execution/implicit-return-type-conversion.shader_test | 9 +--------
.../execution/length-matrix.shader_test | 9 +--------
.../execution/length-vector.shader_test | 9 +--------
.../execution/scalar-swizzle.shader_test | 9 +--------
9 files changed, 9 insertions(+), 72 deletions(-)
diff --git a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-matrix.shader_test b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-matrix.shader_test
index ddb2297..f5da4c9 100644
--- a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-matrix.shader_test
+++ b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-matrix.shader_test
@@ -44,13 +44,6 @@ void main() {
gl_FragColor = color;;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-sized-array.shader_test b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-sized-array.shader_test
index ac13f09..5ac422d 100644
--- a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-sized-array.shader_test
+++ b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-sized-array.shader_test
@@ -52,13 +52,6 @@ void main() {
gl_FragColor = color;;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-struct.shader_test b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-struct.shader_test
index c636566..e11681e 100644
--- a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-struct.shader_test
+++ b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-struct.shader_test
@@ -71,13 +71,6 @@ void main() {
gl_FragColor = color;;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-unsized-array.shader_test b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-unsized-array.shader_test
index 32ae7e6..369ed8c 100644
--- a/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-unsized-array.shader_test
+++ b/tests/spec/arb_shading_language_420pack/execution/aggregate-initializer-unsized-array.shader_test
@@ -54,13 +54,6 @@ void main() {
gl_FragColor = color;;
}
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
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 84edd5b..2256f65 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
@@ -28,14 +28,7 @@ void main() {
gl_FragColor = const_color;
}
-[vertex data]
-piglit_vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
uniform vec4 color 1.0 0.0 0.0 1.0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.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 2c71c20..9c5ec4c 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
@@ -24,13 +24,6 @@ void main() {
gl_FragColor = func();
}
-[vertex data]
-piglit_vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 1.0 0.0 0.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 54b9bc6..8df34e7 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
@@ -48,13 +48,6 @@ void main() {
}
}
-[vertex data]
-piglit_vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.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 4d4ebe6..e5aa39b 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
@@ -36,13 +36,6 @@ void main() {
}
}
-[vertex data]
-piglit_vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.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 2253f4f..11cdbc1 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
@@ -28,13 +28,6 @@ void main() {
gl_FragColor = a.xxxx;
}
-[vertex data]
-piglit_vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0 1.0
--1.0 1.0
-
[test]
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
probe all rgba 1.0 1.0 1.0 1.0
--
1.8.1.4
More information about the Piglit
mailing list