[Piglit] [PATCH 02/40] Delete NV_vertex_program vpfp-generic tests.
Kenneth Graunke
kenneth at whitecape.org
Sat Jun 6 19:11:28 PDT 2015
I plan to delete vpfp-generic. shader_runner does almost everything we
need, but it doesn't support NV_vertex_program.
Given that Mesa hasn't supported NV_vertex_program in a long time, it
doesn't seem worth maintaining the infrastructure for 5 simple tests.
---
tests/all.py | 9 -------
tests/shaders/generic/nv-add.vpfp | 18 --------------
tests/shaders/generic/nv-arl.vpfp | 35 ----------------------------
tests/shaders/generic/nv-init-zero-addr.vpfp | 30 ------------------------
tests/shaders/generic/nv-init-zero-reg.vpfp | 35 ----------------------------
tests/shaders/generic/nv-mov.vpfp | 17 --------------
6 files changed, 144 deletions(-)
delete mode 100644 tests/shaders/generic/nv-add.vpfp
delete mode 100644 tests/shaders/generic/nv-arl.vpfp
delete mode 100644 tests/shaders/generic/nv-init-zero-addr.vpfp
delete mode 100644 tests/shaders/generic/nv-init-zero-reg.vpfp
delete mode 100644 tests/shaders/generic/nv-mov.vpfp
diff --git a/tests/all.py b/tests/all.py
index b773274..19ad73a 100755
--- a/tests/all.py
+++ b/tests/all.py
@@ -2650,15 +2650,6 @@ with profile.group_manager(
with profile.group_manager(
PiglitGLTest,
- grouptools.join('spec', 'nv_vertex_program')) as g:
- add_vpfpgeneric(g, 'nv-mov')
- add_vpfpgeneric(g, 'nv-add')
- add_vpfpgeneric(g, 'nv-arl')
- add_vpfpgeneric(g, 'nv-init-zero-reg')
- add_vpfpgeneric(g, 'nv-init-zero-addr')
-
-with profile.group_manager(
- PiglitGLTest,
grouptools.join('spec', 'nv_vertex_program2_option')) as g:
g(['vp-address-03'], run_concurrent=False)
g(['vp-address-05'], run_concurrent=False)
diff --git a/tests/shaders/generic/nv-add.vpfp b/tests/shaders/generic/nv-add.vpfp
deleted file mode 100644
index c3b4e6f..0000000
--- a/tests/shaders/generic/nv-add.vpfp
+++ /dev/null
@@ -1,18 +0,0 @@
-!!VP1.0
-MOV R0, v[OPOS];
-DP4 o[HPOS].x, c[0], R0;
-DP4 o[HPOS].y, c[1], R0;
-DP4 o[HPOS].z, c[2], R0;
-DP4 o[HPOS].w, c[3], R0;
-
-ADD o[COL0], v[TEX0], c[17];
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-texcoord[0] -0.1 0.4 1.7 0.1
-NVparameter[17] 0.3 -0.1 -1.2 0.5
-expected 0.2 0.3 0.5 0.6
diff --git a/tests/shaders/generic/nv-arl.vpfp b/tests/shaders/generic/nv-arl.vpfp
deleted file mode 100644
index c6f0c42..0000000
--- a/tests/shaders/generic/nv-arl.vpfp
+++ /dev/null
@@ -1,35 +0,0 @@
-!!VP1.0
-MOV R0, v[OPOS];
-DP4 o[HPOS].x, c[0], R0;
-DP4 o[HPOS].y, c[1], R0;
-DP4 o[HPOS].z, c[2], R0;
-DP4 o[HPOS].w, c[3], R0;
-
-ARL A0.x, v[TEX0].x;
-MOV R0, c[A0.x + 20];
-
-ARL A0.x, v[TEX0].y;
-ADD R0, R0, c[A0.x + 20];
-
-ARL A0.x, v[TEX0].z;
-ADD R0, R0, c[A0.x + 20];
-
-ARL A0.x, v[TEX0].w;
-ADD R0, R0, c[A0.x + 20];
-
-MOV o[COL0], R0;
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-texcoord[0] -2 2 5 12
-
-NVparameter[18] 0.7 -0.1 -0.1 -0.1
-NVparameter[22] -0.1 0.5 -0.1 -0.1
-NVparameter[25] -0.1 -0.1 1.1 -0.1
-NVparameter[32] -0.1 -0.1 -0.1 0.8
-
-expected 0.4 0.2 0.8 0.5
diff --git a/tests/shaders/generic/nv-init-zero-addr.vpfp b/tests/shaders/generic/nv-init-zero-addr.vpfp
deleted file mode 100644
index 54eda3f..0000000
--- a/tests/shaders/generic/nv-init-zero-addr.vpfp
+++ /dev/null
@@ -1,30 +0,0 @@
-; The NV_vertex_program spec mandates that the address register must
-; be initialized to all zero.
-
-!!VP1.0
-MOV R0, c[A0.x + 10];
-ARL A0.x, v[TEX0].x;
-ADD o[COL0], R0, c[A0.x + 10];
-
-MOV R3, v[OPOS];
-DP4 o[HPOS].x, c[0], R3;
-DP4 o[HPOS].y, c[1], R3;
-DP4 o[HPOS].z, c[2], R3;
-DP4 o[HPOS].w, c[3], R3;
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-NVparameter[10] 0.1 0.4 0.7 0.1
-NVparameter[11] 0.2 0.2 -0.3 0.1
-texcoord[0] 1 0 0 0
-expected 0.3 0.6 0.4 0.2
-
-!!test
-NVparameter[10] 0.6 0.2 0.5 0.3
-; use NVparameter[11] from previous test
-texcoord[0] 1 0 0 0
-expected 0.8 0.4 0.2 0.4
diff --git a/tests/shaders/generic/nv-init-zero-reg.vpfp b/tests/shaders/generic/nv-init-zero-reg.vpfp
deleted file mode 100644
index 48885c7..0000000
--- a/tests/shaders/generic/nv-init-zero-reg.vpfp
+++ /dev/null
@@ -1,35 +0,0 @@
-; The NV_vertex_program spec mandates that temporary registers must
-; be initialized to all zero.
-
-!!VP1.0
-ADD R0, R0, R1;
-ADD R0, R0, R2;
-ADD R0, R0, R3;
-ADD R0, R0, R4;
-ADD R0, R0, R5;
-ADD R0, R0, R6;
-ADD R0, R0, R7;
-ADD R0, R0, R8;
-ADD R0, R0, R9;
-ADD R0, R0, R10;
-ADD R0, R0, R11;
-ADD o[COL0], R0, v[TEX0];
-
-MOV R3, v[OPOS];
-DP4 o[HPOS].x, c[0], R3;
-DP4 o[HPOS].y, c[1], R3;
-DP4 o[HPOS].z, c[2], R3;
-DP4 o[HPOS].w, c[3], R3;
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-texcoord[0] 0.1 0.4 0.7 0.1
-expected 0.1 0.4 0.7 0.1
-
-!!test
-texcoord[0] 0.6 0.2 0.2 0.3
-expected 0.6 0.2 0.2 0.3
diff --git a/tests/shaders/generic/nv-mov.vpfp b/tests/shaders/generic/nv-mov.vpfp
deleted file mode 100644
index 538bfaa..0000000
--- a/tests/shaders/generic/nv-mov.vpfp
+++ /dev/null
@@ -1,17 +0,0 @@
-!!VP1.0
-MOV R0, v[OPOS];
-DP4 o[HPOS].x, c[0], R0;
-DP4 o[HPOS].y, c[1], R0;
-DP4 o[HPOS].z, c[2], R0;
-DP4 o[HPOS].w, c[3], R0;
-
-MOV o[COL0], v[TEX0];
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-texcoord[0] 0.1 0.4 0.7 0.1
-expected 0.1 0.4 0.7 0.1
--
2.4.2
More information about the Piglit
mailing list