[Piglit] [PATCH 12/16] glsl-1.50: Modify tests that use passthrough.vs to use draw rect

[Ian Romanick]

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/geometry/generate-zero-primitives.shader_test |  9 +--------
 tests/spec/glsl-1.50/execution/passthrough.vs               |  4 ++--
 tests/spec/glsl-1.50/execution/sanity.shader_test           | 13 +++----------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/tests/spec/glsl-1.50/execution/geometry/generate-zero-primitives.shader_test b/tests/spec/glsl-1.50/execution/geometry/generate-zero-primitives.shader_test
index 63f65d9..0e6ac18 100644
--- a/tests/spec/glsl-1.50/execution/geometry/generate-zero-primitives.shader_test
+++ b/tests/spec/glsl-1.50/execution/geometry/generate-zero-primitives.shader_test
@@ -23,15 +23,8 @@ void main()
 	gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
 }
 
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0  1.0
--1.0  1.0
-
 [test]
 clear color 0 0 0 0
 clear
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
 probe all rgb 0.0 0.0 0.0
diff --git a/tests/spec/glsl-1.50/execution/passthrough.vs b/tests/spec/glsl-1.50/execution/passthrough.vs
index d002d71..0514d5b 100644
--- a/tests/spec/glsl-1.50/execution/passthrough.vs
+++ b/tests/spec/glsl-1.50/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/glsl-1.50/execution/sanity.shader_test b/tests/spec/glsl-1.50/execution/sanity.shader_test
index 57153de..c0269f4 100644
--- a/tests/spec/glsl-1.50/execution/sanity.shader_test
+++ b/tests/spec/glsl-1.50/execution/sanity.shader_test
@@ -17,22 +17,15 @@ void main() {
     color = u_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 u_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 1.0 0.0 0.0 1.0
 
 uniform vec4 u_color 0.0 1.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
 
 uniform vec4 u_color 0.0 0.0 1.0 1.0
-draw arrays GL_TRIANGLE_FAN 0 4
+draw rect -1 -1 2 2
 probe all rgba 0.0 0.0 1.0 1.0
-- 
1.8.1.4