arb_cull_distance: simplify tests.

Some of these now fail on r600 before I implement cull distances

6 files changed, 10 insertions, 15 deletions

diff --git a/tests/spec/arb_cull_distance/fs-cull-distance-interpolated.shader_test b/tests/spec/arb_cull_distance/fs-cull-distance-interpolated.shader_test
index 1d50337b2..3dba7e1a9 100644
--- a/tests/spec/arb_cull_distance/fs-cull-distance-interpolated.shader_test
+++ b/tests/spec/arb_cull_distance/fs-cull-distance-interpolated.shader_test
@@ -25,7 +25,7 @@ out float gl_CullDistance[6];
 
 void main()
 {
-  gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+  gl_Position = gl_Vertex;
 
   // Set each value of gl_CullDistance to a linear transformation of
   // gl_Vertex.
@@ -65,8 +65,6 @@ void main()
 }
 
 [test]
-ortho 0 1 0 1
-
 uniform vec4 transform[0]  1.0  1.0 0.0 0.0 # cullDistance[0] = x + y
 uniform vec4 transform[1]  1.0  2.0 0.0 0.0 # cullDistance[1] = x + 2*y
 uniform vec4 transform[2]  2.0  1.0 0.0 0.0 # cullDistance[2] = 2*x + y
diff --git a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-inside-cull-volume.shader_test b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-inside-cull-volume.shader_test
index a117ece9b..af1e7f575 100644
--- a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-inside-cull-volume.shader_test
+++ b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-inside-cull-volume.shader_test
@@ -20,7 +20,7 @@ out float gl_CullDistance[1];
 
 void main(void)
 {
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+	gl_Position = gl_Vertex;
 	gl_CullDistance[0] = 1;
 }
 
diff --git a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-inside-outside-cull-volume.shader_test b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-inside-outside-cull-volume.shader_test
index 4c7de7454..7974b2085 100644
--- a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-inside-outside-cull-volume.shader_test
+++ b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-inside-outside-cull-volume.shader_test
@@ -20,7 +20,7 @@ out float gl_CullDistance[4];
 
 void main(void)
 {
-         gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+         gl_Position = gl_Vertex;
 
          // Compute 2D cordinates relative to a center point of (0.5,
          // 0.5).
@@ -49,8 +49,7 @@ void main(void)
 [test]
 clear color 0.0 1.0 0.0 1.0
 clear
-ortho 0 2 0 2
-draw rect 0.0 0.0 1.0 1.0
+draw rect -1 -1 2 2
 
 relative probe rgba (0.100, 0.100) (0.0, 1.0, 1.0, 1.0)
 relative probe rgba (0.900, 0.900) (0.0, 1.0, 0.0, 1.0)
diff --git a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-on-plane.shader_test b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-on-plane.shader_test
index 204f3bc08..51420cb95 100644
--- a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-on-plane.shader_test
+++ b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-on-plane.shader_test
@@ -20,7 +20,7 @@ out float gl_CullDistance[1];
 
 void main(void)
 {
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+	gl_Position = gl_Vertex;
 	gl_CullDistance[0] = 0;
 }
 
diff --git a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume-inside-clip-volume.shader_test b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume-inside-clip-volume.shader_test
index 3969cdf6d..e884ea216 100644
--- a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume-inside-clip-volume.shader_test
+++ b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume-inside-clip-volume.shader_test
@@ -22,7 +22,7 @@ out float gl_CullDistance[2];
 
 void main(void)
 {
-         gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+         gl_Position = gl_Vertex;
 
          // Compute 2D cordinates relative to a center point of (0.5,
          // 0.5).
@@ -52,8 +52,7 @@ void main(void)
 [test]
 clear color 0.0 1.0 0.0 1.0
 clear
-ortho 0 2 0 2
-draw rect 0.0 0.0 1.0 1.0
+draw rect -1 -1 2 2
 
 relative probe rgba (0.100, 0.100) (0.0, 1.0, 1.0, 1.0)
 relative probe rgba (0.900, 0.900) (0.0, 1.0, 0.0, 1.0)
diff --git a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume.shader_test b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume.shader_test
index e0449d0a8..878693351 100644
--- a/tests/spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume.shader_test
+++ b/tests/spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume.shader_test
@@ -20,9 +20,9 @@ out float gl_CullDistance[1];
 
 void main(void)
 {
-         gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+         gl_Position = gl_Vertex;
 
-         gl_CullDistance[0] = -1;
+         gl_CullDistance[0] = -1.0;
 }
 
 [fragment shader]
@@ -36,7 +36,6 @@ void main(void)
 [test]
 clear color 0.0 1.0 0.0 1.0
 clear
-ortho 0 1 0 1
-draw rect 1.0 0.0 0.0 1.0
+draw rect -1 -1 2 2
 
 probe all rgba 0.0 1.0 0.0 1.0