[Piglit] [PATCH 15/16] arb_shading_language_420pack: Modify tests to use draw rect
Ian Romanick
idr at freedesktop.org
Mon Aug 26 11:37:14 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>
Cc: Matt Turner <mattst88 at gmail.com>
Cc: Paul Berry <stereoytpe441 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 +--------
tests/spec/arb_shading_language_420pack/execution/passthrough.vs | 4 ++--
.../execution/scalar-swizzle.shader_test | 9 +--------
10 files changed, 11 insertions(+), 74 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 ed4f67c..312cb8b 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
@@ -29,14 +29,7 @@ void main() {
gl_FragColor = const_color;
}
-[vertex data]
-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 31dd0bf..892c487 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
@@ -25,13 +25,6 @@ void main() {
gl_FragColor = func();
}
-[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 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 bb9d3e7..fb68857 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
@@ -49,13 +49,6 @@ void main() {
}
}
-[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/length-vector.shader_test b/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test
index 04adb41..5fcf3ca 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
@@ -37,13 +37,6 @@ void main() {
}
}
-[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/passthrough.vs b/tests/spec/arb_shading_language_420pack/execution/passthrough.vs
index d002d71..0514d5b 100644
--- a/tests/spec/arb_shading_language_420pack/execution/passthrough.vs
+++ b/tests/spec/arb_shading_language_420pack/execution/passthrough.vs
@@ -1,6 +1,6 @@
-in vec4 vertex;
+in vec4 piglit_vertex;
void main()
{
- gl_Position = vertex;
+ gl_Position = piglit_vertex;
}
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 8caed04..769391a 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
@@ -29,13 +29,6 @@ void main() {
gl_FragColor = a.xxxx;
}
-[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 1.0 1.0 1.0 1.0
--
1.8.1.4
More information about the Piglit
mailing list