[Piglit] [PATCH 4/7] glsl-1.10 / glsl-1.20: Don't use ortho in variable indexing tests.

[Matt Turner]

Using ortho makes shrinking the window size much more difficult, which
makes running tests in simulation take much longer.
---
 tests/spec/glsl-1.10/variable-index-read.sh  | 18 +++---------------
 tests/spec/glsl-1.10/variable-index-write.sh | 17 +++--------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/tests/spec/glsl-1.10/variable-index-read.sh b/tests/spec/glsl-1.10/variable-index-read.sh
index 80cb078..919297c 100755
--- a/tests/spec/glsl-1.10/variable-index-read.sh
+++ b/tests/spec/glsl-1.10/variable-index-read.sh
@@ -283,13 +283,7 @@ function emit_test_vectors
 	array_dim=$((index_value+1))
     fi
 
-    cat <<EOF
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-EOF
+    echo "[test]"
 
     # NOTE: shader_runner uses the matCxR names even for GLSL 1.10
     v=${version/./}
@@ -338,7 +332,6 @@ EOF
 	    echo "uniform int index $((i - 1))"
 	fi
 
-	x_base=$(((i - 1) * (15 * matrix_dim + 10)))
 	for c in $columns; do
 	    if [ "x$col" = "xcol" ]; then
 		echo "uniform int col $((c - 1))"
@@ -354,13 +347,8 @@ EOF
 		    echo "uniform ${expect_type} expect $e"
 		fi
 
-		x=$((x_base + 15 * c - 10))
-		y=$((15 * r - 10))
-		echo "draw rect $x $y 10 10"
-
-		x=$((x + 5))
-		y=$((y + 5))
-		echo "probe rgb $x $y 0.0 1.0 0.0"
+		echo "draw rect -1 -1 2 2"
+		echo "probe all rgb 0.0 1.0 0.0"
 		echo
 	    done
 	done
diff --git a/tests/spec/glsl-1.10/variable-index-write.sh b/tests/spec/glsl-1.10/variable-index-write.sh
index 1370f8f..ac9a96c 100755
--- a/tests/spec/glsl-1.10/variable-index-write.sh
+++ b/tests/spec/glsl-1.10/variable-index-write.sh
@@ -216,13 +216,7 @@ function emit_test_vectors
     col=$5
     value_type=$6
 
-    cat <<EOF
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-EOF
+    echo "[test]"
 
     # NOTE: shader_runner uses the matCxR names even for GLSL 1.10
     type="mat${matrix_dim}x${matrix_dim}"
@@ -313,13 +307,8 @@ EOF
 		echo "uniform ${type} src_matrix ${mat/$v/$bad}"
 		echo "uniform ${value_type} value $v"
 
-		x=$((x_base + 15 * c - 10))
-		y=$((15 * r - 10))
-		echo "draw rect $x $y 10 10"
-
-		x=$(($x + 5))
-		y=$(($y + 5))
-		echo "probe rgb $x $y 0.0 1.0 0.0"
+		echo "draw rect -1 -1 2 2"
+		echo "probe all rgb 0.0 1.0 0.0"
 		echo
 	    done
 	done
-- 
1.8.1.5