[Piglit] [PATCH 5/7] glsl-1.20: Don't use ortho in outerProduct tests.

[Matt Turner]

---
 tests/spec/glsl-1.20/execution/outerProduct-const.sh | 16 ++++------------
 tests/spec/glsl-1.20/execution/outerProduct.sh       | 11 ++---------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/tests/spec/glsl-1.20/execution/outerProduct-const.sh b/tests/spec/glsl-1.20/execution/outerProduct-const.sh
index 2837db1..508aa4a 100755
--- a/tests/spec/glsl-1.20/execution/outerProduct-const.sh
+++ b/tests/spec/glsl-1.20/execution/outerProduct-const.sh
@@ -125,12 +125,8 @@ varying vec4 color;
 void main() { gl_FragColor = color; }
 
 [test]
-clear color 0.5 0.5 0.5 0.0
-clear
-ortho
-
-draw rect 10 10 10 10
-probe rgb 15 15 0.0 1.0 0.0
+draw rect -1 -1 2 2
+probe all rgb 0.0 1.0 0.0
 EOF
 }
 
@@ -182,12 +178,8 @@ void main() {
 }
 
 [test]
-clear color 0.5 0.5 0.5 0.0
-clear
-ortho
-
-draw rect 10 10 10 10
-probe rgb 15 15 0.0 1.0 0.0
+draw rect -1 -1 2 2
+probe all rgb 0.0 1.0 0.0
 EOF
 }
 
diff --git a/tests/spec/glsl-1.20/execution/outerProduct.sh b/tests/spec/glsl-1.20/execution/outerProduct.sh
index ec3f088..64d1a1c 100755
--- a/tests/spec/glsl-1.20/execution/outerProduct.sh
+++ b/tests/spec/glsl-1.20/execution/outerProduct.sh
@@ -59,9 +59,8 @@ function emit_outerProduct_data
     echo "uniform ${vtype}${r} r ${rvec}"
     echo "uniform mat${r}x${c} expected ${mat}"
 
-    x=$((20 * $4 - 10))
-    echo "draw rect $x 10 10 10"
-    echo "probe rgb $(($x + 5)) 15 0.0 1.0 0.0"
+    echo "draw rect -1 -1 2 2"
+    echo "probe all rgb 0.0 1.0 0.0"
 }
 
 function emit_vs_test
@@ -116,9 +115,6 @@ varying vec4 color;
 void main() { gl_FragColor = color; }
 
 [test]
-clear color 0.5 0.5 0.5 0.0
-clear
-ortho
 EOF
 
     emit_outerProduct_data $c $r $vtype 1 >> $name
@@ -176,9 +172,6 @@ void main() {
 }
 
 [test]
-clear color 0.5 0.5 0.5 0.0
-clear
-ortho
 EOF
 
     emit_outerProduct_data $c $r $vtype 1 >> $name
-- 
1.8.1.5