python/regress: Rename test files from *.txt to *.sh -- won't be .gitignored.
authorMichal Krol <michal@vmware.com>
Wed, 1 Apr 2009 08:23:09 +0000 (10:23 +0200)
committerMichal Krol <michal@vmware.com>
Wed, 1 Apr 2009 08:34:08 +0000 (10:34 +0200)
15 files changed:
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-abs.sh [new file with mode: 0644]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-abs.txt [deleted file]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-add.sh [new file with mode: 0644]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-add.txt [deleted file]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp3.sh [new file with mode: 0644]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp3.txt [deleted file]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp4.sh [new file with mode: 0644]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp4.txt [deleted file]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mov.sh [new file with mode: 0644]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mov.txt [deleted file]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mul.sh [new file with mode: 0644]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mul.txt [deleted file]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-sub.sh [new file with mode: 0644]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-sub.txt [deleted file]
src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py

diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-abs.sh b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-abs.sh
new file mode 100644 (file)
index 0000000..66c1986
--- /dev/null
@@ -0,0 +1,11 @@
+VERT1.1
+DCL IN[0], POSITION
+DCL IN[1], COLOR
+DCL OUT[0], POSITION
+DCL OUT[1], COLOR
+DCL TEMP[0]
+IMM FLT32 { 0.2, 0.2, 0.0, 0.0 }
+ADD TEMP[0], IN[0], IMM[0]
+ABS OUT[0], TEMP[0]
+MOV OUT[1], IN[1]
+END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-abs.txt b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-abs.txt
deleted file mode 100644 (file)
index 66c1986..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-VERT1.1
-DCL IN[0], POSITION
-DCL IN[1], COLOR
-DCL OUT[0], POSITION
-DCL OUT[1], COLOR
-DCL TEMP[0]
-IMM FLT32 { 0.2, 0.2, 0.0, 0.0 }
-ADD TEMP[0], IN[0], IMM[0]
-ABS OUT[0], TEMP[0]
-MOV OUT[1], IN[1]
-END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-add.sh b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-add.sh
new file mode 100644 (file)
index 0000000..78753b7
--- /dev/null
@@ -0,0 +1,9 @@
+VERT1.1
+DCL IN[0], POSITION
+DCL IN[1], COLOR
+DCL OUT[0], POSITION
+DCL OUT[1], COLOR
+IMM FLT32 { 0.2, -0.1, 0.0, 0.0 }
+ADD OUT[0], IN[0], IMM[0]
+MOV OUT[1], IN[1]
+END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-add.txt b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-add.txt
deleted file mode 100644 (file)
index 78753b7..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-VERT1.1
-DCL IN[0], POSITION
-DCL IN[1], COLOR
-DCL OUT[0], POSITION
-DCL OUT[1], COLOR
-IMM FLT32 { 0.2, -0.1, 0.0, 0.0 }
-ADD OUT[0], IN[0], IMM[0]
-MOV OUT[1], IN[1]
-END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp3.sh b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp3.sh
new file mode 100644 (file)
index 0000000..e4c1c4a
--- /dev/null
@@ -0,0 +1,12 @@
+VERT1.1
+DCL IN[0], POSITION
+DCL IN[1], COLOR
+DCL OUT[0], POSITION
+DCL OUT[1], COLOR
+DCL TEMP[0]
+IMM FLT32 { 0.0, 0.0, 1.0, 1.0 }
+DP3 TEMP[0].xy, IN[0], IN[0]
+MOV TEMP[0].zw, IMM[0]
+MUL OUT[0], IN[0], TEMP[0]
+MOV OUT[1], IN[1]
+END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp3.txt b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp3.txt
deleted file mode 100644 (file)
index e4c1c4a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-VERT1.1
-DCL IN[0], POSITION
-DCL IN[1], COLOR
-DCL OUT[0], POSITION
-DCL OUT[1], COLOR
-DCL TEMP[0]
-IMM FLT32 { 0.0, 0.0, 1.0, 1.0 }
-DP3 TEMP[0].xy, IN[0], IN[0]
-MOV TEMP[0].zw, IMM[0]
-MUL OUT[0], IN[0], TEMP[0]
-MOV OUT[1], IN[1]
-END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp4.sh b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp4.sh
new file mode 100644 (file)
index 0000000..3e5f248
--- /dev/null
@@ -0,0 +1,12 @@
+VERT1.1
+DCL IN[0], POSITION
+DCL IN[1], COLOR
+DCL OUT[0], POSITION
+DCL OUT[1], COLOR
+DCL TEMP[0]
+IMM FLT32 { 0.0, 0.0, 1.0, 1.0 }
+DP4 TEMP[0].xy, IN[0], IN[0]
+MOV TEMP[0].zw, IMM[0]
+MUL OUT[0], IN[0], TEMP[0]
+MOV OUT[1], IN[1]
+END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp4.txt b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp4.txt
deleted file mode 100644 (file)
index 3e5f248..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-VERT1.1
-DCL IN[0], POSITION
-DCL IN[1], COLOR
-DCL OUT[0], POSITION
-DCL OUT[1], COLOR
-DCL TEMP[0]
-IMM FLT32 { 0.0, 0.0, 1.0, 1.0 }
-DP4 TEMP[0].xy, IN[0], IN[0]
-MOV TEMP[0].zw, IMM[0]
-MUL OUT[0], IN[0], TEMP[0]
-MOV OUT[1], IN[1]
-END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mov.sh b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mov.sh
new file mode 100644 (file)
index 0000000..12712ff
--- /dev/null
@@ -0,0 +1,8 @@
+VERT1.1
+DCL IN[0], POSITION
+DCL IN[1], COLOR
+DCL OUT[0], POSITION
+DCL OUT[1], COLOR
+MOV OUT[0], IN[0]
+MOV OUT[1], IN[1]
+END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mov.txt b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mov.txt
deleted file mode 100644 (file)
index 12712ff..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-VERT1.1
-DCL IN[0], POSITION
-DCL IN[1], COLOR
-DCL OUT[0], POSITION
-DCL OUT[1], COLOR
-MOV OUT[0], IN[0]
-MOV OUT[1], IN[1]
-END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mul.sh b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mul.sh
new file mode 100644 (file)
index 0000000..1289fcd
--- /dev/null
@@ -0,0 +1,9 @@
+VERT1.1
+DCL IN[0], POSITION
+DCL IN[1], COLOR
+DCL OUT[0], POSITION
+DCL OUT[1], COLOR
+IMM FLT32 { 0.6, 0.6, 1.0, 1.0 }
+MUL OUT[0], IN[0], IMM[0]
+MOV OUT[1], IN[1]
+END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mul.txt b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mul.txt
deleted file mode 100644 (file)
index 1289fcd..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-VERT1.1
-DCL IN[0], POSITION
-DCL IN[1], COLOR
-DCL OUT[0], POSITION
-DCL OUT[1], COLOR
-IMM FLT32 { 0.6, 0.6, 1.0, 1.0 }
-MUL OUT[0], IN[0], IMM[0]
-MOV OUT[1], IN[1]
-END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-sub.sh b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-sub.sh
new file mode 100644 (file)
index 0000000..9190086
--- /dev/null
@@ -0,0 +1,9 @@
+VERT1.1
+DCL IN[0], POSITION
+DCL IN[1], COLOR
+DCL OUT[0], POSITION
+DCL OUT[1], COLOR
+IMM FLT32 { 0.1, 0.1, 0.0, 0.0 }
+SUB OUT[0], IN[0], IMM[0]
+MOV OUT[1], IN[1]
+END
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-sub.txt b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-sub.txt
deleted file mode 100644 (file)
index 9190086..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-VERT1.1
-DCL IN[0], POSITION
-DCL IN[1], COLOR
-DCL OUT[0], POSITION
-DCL OUT[1], COLOR
-IMM FLT32 { 0.1, 0.1, 0.0, 0.0 }
-SUB OUT[0], IN[0], IMM[0]
-MOV OUT[1], IN[1]
-END
index b393500742cc6de4328b53a8f18232ee3f85038a..7e0b561d79a6fc73890b8f889565d034186e9b62 100644 (file)
@@ -132,7 +132,7 @@ def test(dev, name):
     ctx.surface_clear(zbuf, 0xffffffff)
 
     # vertex shader
-    vs = Shader(file('vert-' + name + '.txt', 'rt').read())
+    vs = Shader(file('vert-' + name + '.sh', 'rt').read())
     ctx.set_vertex_shader(vs)
 
     # fragment shader