asmparsertest: Additional GL_NV_vertex_program3 texturing tests

29 files changed, 296 insertions, 7 deletions

diff --git a/tests/asmparsertest/shaders/ARBvp1.0/tex-17.txt b/tests/asmparsertest/shaders/ARBvp1.0/tex-17.txt
new file mode 100644
index 000000000..964ae5c49
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/tex-17.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+
+TEX	result.color, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/tex-18.txt b/tests/asmparsertest/shaders/ARBvp1.0/tex-18.txt
new file mode 100644
index 000000000..e1eb023d8
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/tex-18.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+
+OUTPUT	SHADOW1D = result.color;
+TEX	SHADOW1D, vertex.texcoord[0], texture[0], SHADOW1D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/tex-19.txt b/tests/asmparsertest/shaders/ARBvp1.0/tex-19.txt
new file mode 100644
index 000000000..6902e352c
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/tex-19.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+
+OUTPUT	SHADOW2D = result.color;
+TEX	SHADOW2D, vertex.texcoord[0], texture[0], SHADOW2D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/tex-20.txt b/tests/asmparsertest/shaders/ARBvp1.0/tex-20.txt
new file mode 100644
index 000000000..dc78990b9
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/tex-20.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+
+OUTPUT	SHADOWRECT = result.color;
+TEX	SHADOWRECT, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txb-17.txt b/tests/asmparsertest/shaders/ARBvp1.0/txb-17.txt
new file mode 100644
index 000000000..8cb4a34f4
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txb-17.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+
+TXB	result.color, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txb-18.txt b/tests/asmparsertest/shaders/ARBvp1.0/txb-18.txt
new file mode 100644
index 000000000..0120a6864
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txb-18.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+
+OUTPUT	SHADOW1D = result.color;
+TXB	SHADOW1D, vertex.texcoord[0], texture[0], SHADOW1D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txb-19.txt b/tests/asmparsertest/shaders/ARBvp1.0/txb-19.txt
new file mode 100644
index 000000000..0d68561c1
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txb-19.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+
+OUTPUT	SHADOW2D = result.color;
+TXB	SHADOW2D, vertex.texcoord[0], texture[0], SHADOW2D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txb-20.txt b/tests/asmparsertest/shaders/ARBvp1.0/txb-20.txt
new file mode 100644
index 000000000..71420dacf
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txb-20.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+
+OUTPUT	SHADOWRECT = result.color;
+TXB	SHADOWRECT, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txd-17.txt b/tests/asmparsertest/shaders/ARBvp1.0/txd-17.txt
new file mode 100644
index 000000000..ed0b5c415
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txd-17.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+# FAIL - TXD not supported by GL_NV_vertex_program3
+
+TXD	result.color, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txd-18.txt b/tests/asmparsertest/shaders/ARBvp1.0/txd-18.txt
new file mode 100644
index 000000000..c4efa074c
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txd-18.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# FAIL - TXD not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOW1D = result.color;
+TXD	SHADOW1D, vertex.texcoord[0], texture[0], SHADOW1D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txd-19.txt b/tests/asmparsertest/shaders/ARBvp1.0/txd-19.txt
new file mode 100644
index 000000000..0c439fb38
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txd-19.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# FAIL - TXD not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOW2D = result.color;
+TXD	SHADOW2D, vertex.texcoord[0], texture[0], SHADOW2D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txd-20.txt b/tests/asmparsertest/shaders/ARBvp1.0/txd-20.txt
new file mode 100644
index 000000000..6f73279f2
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txd-20.txt
@@ -0,0 +1,11 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+# FAIL - TXD not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOWRECT = result.color;
+TXD	SHADOWRECT, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txf-17.txt b/tests/asmparsertest/shaders/ARBvp1.0/txf-17.txt
new file mode 100644
index 000000000..8f2b0c423
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txf-17.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+# FAIL - TXF not supported by GL_NV_vertex_program3
+
+TXF	result.color, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txf-18.txt b/tests/asmparsertest/shaders/ARBvp1.0/txf-18.txt
new file mode 100644
index 000000000..b05d0c5f4
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txf-18.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# FAIL - TXF not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOW1D = result.color;
+TXF	SHADOW1D, vertex.texcoord[0], texture[0], SHADOW1D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txf-19.txt b/tests/asmparsertest/shaders/ARBvp1.0/txf-19.txt
new file mode 100644
index 000000000..5b3d1de3a
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txf-19.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# FAIL - TXF not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOW2D = result.color;
+TXF	SHADOW2D, vertex.texcoord[0], texture[0], SHADOW2D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txf-20.txt b/tests/asmparsertest/shaders/ARBvp1.0/txf-20.txt
new file mode 100644
index 000000000..52dd9ccea
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txf-20.txt
@@ -0,0 +1,11 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+# FAIL - TXF not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOWRECT = result.color;
+TXF	SHADOWRECT, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txl-17.txt b/tests/asmparsertest/shaders/ARBvp1.0/txl-17.txt
new file mode 100644
index 000000000..3f54d9128
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txl-17.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+
+TXL	result.color, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txl-18.txt b/tests/asmparsertest/shaders/ARBvp1.0/txl-18.txt
new file mode 100644
index 000000000..d1592f83c
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txl-18.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+
+OUTPUT	SHADOW1D = result.color;
+TXL	SHADOW1D, vertex.texcoord[0], texture[0], SHADOW1D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txl-19.txt b/tests/asmparsertest/shaders/ARBvp1.0/txl-19.txt
new file mode 100644
index 000000000..6de67ec5b
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txl-19.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+
+OUTPUT	SHADOW2D = result.color;
+TXL	SHADOW2D, vertex.texcoord[0], texture[0], SHADOW2D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txl-20.txt b/tests/asmparsertest/shaders/ARBvp1.0/txl-20.txt
new file mode 100644
index 000000000..80f0f31a0
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txl-20.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+
+OUTPUT	SHADOWRECT = result.color;
+TXL	SHADOWRECT, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txp-17.txt b/tests/asmparsertest/shaders/ARBvp1.0/txp-17.txt
new file mode 100644
index 000000000..2f2d9ea83
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txp-17.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+
+TXP	result.color, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txp-18.txt b/tests/asmparsertest/shaders/ARBvp1.0/txp-18.txt
new file mode 100644
index 000000000..e3bdb55d1
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txp-18.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+
+OUTPUT	SHADOW1D = result.color;
+TXP	SHADOW1D, vertex.texcoord[0], texture[0], SHADOW1D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txp-19.txt b/tests/asmparsertest/shaders/ARBvp1.0/txp-19.txt
new file mode 100644
index 000000000..e00cbd5e2
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txp-19.txt
@@ -0,0 +1,9 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+
+OUTPUT	SHADOW2D = result.color;
+TXP	SHADOW2D, vertex.texcoord[0], texture[0], SHADOW2D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txp-20.txt b/tests/asmparsertest/shaders/ARBvp1.0/txp-20.txt
new file mode 100644
index 000000000..a33291622
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txp-20.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+
+OUTPUT	SHADOWRECT = result.color;
+TXP	SHADOWRECT, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txq-17.txt b/tests/asmparsertest/shaders/ARBvp1.0/txq-17.txt
new file mode 100644
index 000000000..982520005
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txq-17.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+# FAIL - TXQ not supported by GL_NV_vertex_program3
+
+TXQ	result.color, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txq-18.txt b/tests/asmparsertest/shaders/ARBvp1.0/txq-18.txt
new file mode 100644
index 000000000..9ec10e23e
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txq-18.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# FAIL - TXQ not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOW1D = result.color;
+TXQ	SHADOW1D, vertex.texcoord[0], texture[0], SHADOW1D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txq-19.txt b/tests/asmparsertest/shaders/ARBvp1.0/txq-19.txt
new file mode 100644
index 000000000..fc716ca58
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txq-19.txt
@@ -0,0 +1,10 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# FAIL - TXQ not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOW2D = result.color;
+TXQ	SHADOW2D, vertex.texcoord[0], texture[0], SHADOW2D;
+END
diff --git a/tests/asmparsertest/shaders/ARBvp1.0/txq-20.txt b/tests/asmparsertest/shaders/ARBvp1.0/txq-20.txt
new file mode 100644
index 000000000..15fcaaa38
--- /dev/null
+++ b/tests/asmparsertest/shaders/ARBvp1.0/txq-20.txt
@@ -0,0 +1,11 @@
+!!ARBvp1.0
+# REQUIRE GL_NV_vertex_program3
+OPTION	NV_vertex_program3;
+# REQUIRE GL_ARB_fragment_program_shadow
+OPTION	ARB_fragment_program_shadow;
+# REQUIRE GL_ARB_texture_rectangle
+# FAIL - TXQ not supported by GL_NV_vertex_program3
+
+OUTPUT	SHADOWRECT = result.color;
+TXQ	SHADOWRECT, vertex.texcoord[0], texture[0], SHADOWRECT;
+END
diff --git a/tests/asmparsertest/vp-tex.sh b/tests/asmparsertest/vp-tex.sh
index 5372a528b..09a0b1c02 100755
--- a/tests/asmparsertest/vp-tex.sh
+++ b/tests/asmparsertest/vp-tex.sh
@@ -27,19 +27,21 @@
 
 function emit_target_require
 {
-    if [ "$1" = "RECT" ]; then
+    t=$1
+    if echo $t | grep -q ^SHADOW ; then
+	echo "# REQUIRE GL_ARB_fragment_program_shadow"
+	echo "OPTION	ARB_fragment_program_shadow;"
+	t=$(echo $t | sed 's/^SHADOW//')
+    fi
+    if [ "$t" = "RECT" ]; then
 	echo "# REQUIRE GL_ARB_texture_rectangle"
     fi
-    if [ "$1" = "CUBE" ]; then
+    if [ "$t" = "CUBE" ]; then
 	echo "# REQUIRE GL_ARB_texture_cube_map"
     fi
-    if [ "$1" = "3D" ]; then
+    if [ "$t" = "3D" ]; then
 	echo "# REQUIRE GL_EXT_texture3D"
     fi
-    if [ "$1" = "SHADOW1D" -o "$1" = "SHADOW2D" ]; then
-	echo "# REQUIRE GL_ARB_fragment_program_shadow"
-	echo "OPTION	ARB_fragment_program_shadow;"
-    fi
 }
 
 
@@ -120,4 +122,20 @@ for inst in TEX TXB TXD TXF TXL TXP TXQ; do
 	emit_shader_NVvp3_alt $inst $target > $path/$file
 	i=$((i + 1))
     done
+
+    # Add this set of tests cases here so that the tests from the previous
+    # don't get re-numbered.  This prevents unnecessary churn in the diffs.
+    for target in SHADOWRECT; do
+	file=$(printf "%s-%02d.txt" $inst_low $i)
+
+	emit_shader_NVvp3 $inst $target > $path/$file
+	i=$((i + 1))
+    done
+
+    for target in SHADOW1D SHADOW2D SHADOWRECT; do
+	file=$(printf "%s-%02d.txt" $inst_low $i)
+
+	emit_shader_NVvp3_alt $inst $target > $path/$file
+	i=$((i + 1))
+    done
 done