[Piglit] [PATCH 3/6] arb_vertex_program: Remove unnecessary fragment programs.
Matt Turner
mattst88 at gmail.com
Tue Nov 10 22:46:20 PST 2015
These just performed actions the fixed-function processing would have
done. Removing them allows these tests to execute on hardware that
supports ARB_vertex_program but not ARB_fragment_program (like R200).
---
tests/spec/arb_vertex_program/arl.shader_test | 6 ------
tests/spec/arb_vertex_program/big-param.shader_test | 6 ------
tests/spec/arb_vertex_program/dataflow-bug.shader_test | 6 ------
.../vp-arl-constant-array-huge-offset-neg.shader_test | 6 ------
.../vp-arl-constant-array-huge-offset.shader_test | 6 ------
.../vp-arl-constant-array-huge-overwritten.shader_test | 6 ------
.../vp-arl-constant-array-huge-relative-offset.shader_test | 6 ------
.../vp-arl-constant-array-huge-varying.shader_test | 6 ------
.../spec/arb_vertex_program/vp-arl-constant-array-huge.shader_test | 6 ------
.../arb_vertex_program/vp-arl-constant-array-varying.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-arl-constant-array.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-arl-env-array.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-arl-local-array.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-arl-neg-array-2.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-arl-neg-array.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-constant-array-huge.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-constant-array.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-constant-negate.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-exp-alias.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-max.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-min.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-sge-alias.shader_test | 6 ------
tests/spec/arb_vertex_program/vp-two-constants.shader_test | 6 ------
23 files changed, 138 deletions(-)
diff --git a/tests/spec/arb_vertex_program/arl.shader_test b/tests/spec/arb_vertex_program/arl.shader_test
index 5fc3eec..3ee67a7 100644
--- a/tests/spec/arb_vertex_program/arl.shader_test
+++ b/tests/spec/arb_vertex_program/arl.shader_test
@@ -4,7 +4,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -17,11 +16,6 @@ ARL A0.x, program.local[2].x;
MOV result.color, p[A0.x];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (0.0, 1.0, 0.0, 1.0)
diff --git a/tests/spec/arb_vertex_program/big-param.shader_test b/tests/spec/arb_vertex_program/big-param.shader_test
index 07da565..3418c86 100644
--- a/tests/spec/arb_vertex_program/big-param.shader_test
+++ b/tests/spec/arb_vertex_program/big-param.shader_test
@@ -1,7 +1,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -28,11 +27,6 @@ FLR tmp3.z, tmp2.x;
MUL result.color, tmp3, 0.00390625;
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (128.250488281, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/dataflow-bug.shader_test b/tests/spec/arb_vertex_program/dataflow-bug.shader_test
index cf6efec..e38af56 100644
--- a/tests/spec/arb_vertex_program/dataflow-bug.shader_test
+++ b/tests/spec/arb_vertex_program/dataflow-bug.shader_test
@@ -7,7 +7,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -28,11 +27,6 @@ MAD ty, tweight.y, t, ty;
ADD result.color, tx, ty;
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
texcoord 0 (-1, 2, 0, 0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-offset-neg.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-offset-neg.shader_test
index e65da93..00fed9e 100644
--- a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-offset-neg.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-offset-neg.shader_test
@@ -4,7 +4,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -135,11 +134,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x-1];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (1.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-offset.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-offset.shader_test
index 1dc9fee..3ad18d4 100644
--- a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-offset.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-offset.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -134,11 +133,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x+1];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (-1.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-overwritten.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-overwritten.shader_test
index 24f0a60..650f895 100644
--- a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-overwritten.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-overwritten.shader_test
@@ -5,7 +5,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -138,11 +137,6 @@ MOV result.color, vals[A0.x+0];
MOV result.color, vals[0];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (1.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-relative-offset.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-relative-offset.shader_test
index 5c65cb2..a7cfdf0 100644
--- a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-relative-offset.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-relative-offset.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -134,11 +133,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x+109];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (-1.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-varying.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-varying.shader_test
index 6f7ebc2..7192d92 100644
--- a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-varying.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge-varying.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -156,11 +155,6 @@ ARL A0.x, temp.x;
ADD result.color, vals[A0.x], vertex.position.xyzz;
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 0.0 1.0 1.0 1.0
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge.shader_test
index cdf54f3..06af36e 100644
--- a/tests/spec/arb_vertex_program/vp-arl-constant-array-huge.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array-huge.shader_test
@@ -5,7 +5,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -136,11 +135,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x+0];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (0.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array-varying.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array-varying.shader_test
index 13eab84..3cc11af 100644
--- a/tests/spec/arb_vertex_program/vp-arl-constant-array-varying.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array-varying.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -22,11 +21,6 @@ ARL A0.x, temp.x;
ADD result.color, vals[A0.x], vertex.position.xyzz;
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 0.0 1.0 1.0 1.0
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array.shader_test
index 6b4118f..5aa83ca 100644
--- a/tests/spec/arb_vertex_program/vp-arl-constant-array.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -19,11 +18,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x+0];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (3.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-env-array.shader_test b/tests/spec/arb_vertex_program/vp-arl-env-array.shader_test
index 999f773..1499d6e 100644
--- a/tests/spec/arb_vertex_program/vp-arl-env-array.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-env-array.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -14,11 +13,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x+0];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (3.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-local-array.shader_test b/tests/spec/arb_vertex_program/vp-arl-local-array.shader_test
index acad533..33a0d4b 100644
--- a/tests/spec/arb_vertex_program/vp-arl-local-array.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-local-array.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -14,11 +13,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x+0];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (3.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-neg-array-2.shader_test b/tests/spec/arb_vertex_program/vp-arl-neg-array-2.shader_test
index 99278c8..7a6e85a 100644
--- a/tests/spec/arb_vertex_program/vp-arl-neg-array-2.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-neg-array-2.shader_test
@@ -4,7 +4,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -20,11 +19,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x+6];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (-3, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-arl-neg-array.shader_test b/tests/spec/arb_vertex_program/vp-arl-neg-array.shader_test
index ca7cb93..8890f02 100644
--- a/tests/spec/arb_vertex_program/vp-arl-neg-array.shader_test
+++ b/tests/spec/arb_vertex_program/vp-arl-neg-array.shader_test
@@ -4,7 +4,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -20,11 +19,6 @@ ARL A0.x, program.local[0].x;
MOV result.color, vals[A0.x-3];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (6, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-constant-array-huge.shader_test b/tests/spec/arb_vertex_program/vp-constant-array-huge.shader_test
index 4cb8d74..da723cd 100644
--- a/tests/spec/arb_vertex_program/vp-constant-array-huge.shader_test
+++ b/tests/spec/arb_vertex_program/vp-constant-array-huge.shader_test
@@ -5,7 +5,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -134,11 +133,6 @@ PARAM vals[] = {
MOV result.color, vals[3];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
parameter local_vp 0 (3.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/arb_vertex_program/vp-constant-array.shader_test b/tests/spec/arb_vertex_program/vp-constant-array.shader_test
index e5157c2..30d7189 100644
--- a/tests/spec/arb_vertex_program/vp-constant-array.shader_test
+++ b/tests/spec/arb_vertex_program/vp-constant-array.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -16,11 +15,6 @@ PARAM vals[4] = { {0.5, 1.0, 2.0, 0.0},
MOV result.color, vals[3];
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 0.0 0.0 1.0 1.0
diff --git a/tests/spec/arb_vertex_program/vp-constant-negate.shader_test b/tests/spec/arb_vertex_program/vp-constant-negate.shader_test
index 98bf5cf..e80bb20 100644
--- a/tests/spec/arb_vertex_program/vp-constant-negate.shader_test
+++ b/tests/spec/arb_vertex_program/vp-constant-negate.shader_test
@@ -3,7 +3,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -19,11 +18,6 @@ MOV result.color, {0.0, 1.0, 0.0, 0.0};
MOV result.color.x, temp1;
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 1.0 0.0 1.0 1.0
diff --git a/tests/spec/arb_vertex_program/vp-exp-alias.shader_test b/tests/spec/arb_vertex_program/vp-exp-alias.shader_test
index 1149041..6f033d5 100644
--- a/tests/spec/arb_vertex_program/vp-exp-alias.shader_test
+++ b/tests/spec/arb_vertex_program/vp-exp-alias.shader_test
@@ -4,7 +4,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -17,11 +16,6 @@ EXP temp1, temp1.y;
ADD result.color, temp1, {-3.5, 0, -5.15, -0.5};
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 1.0 1.0 1.0 1.0
diff --git a/tests/spec/arb_vertex_program/vp-max.shader_test b/tests/spec/arb_vertex_program/vp-max.shader_test
index 0034fc5..12b6dd2 100644
--- a/tests/spec/arb_vertex_program/vp-max.shader_test
+++ b/tests/spec/arb_vertex_program/vp-max.shader_test
@@ -4,7 +4,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -18,11 +17,6 @@ MAX temp1, temp1, temp2;
ADD result.color, temp1, {0.0, 0.0, -1.75, -1.75};
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 1.0 1.0 1.0 1.0
diff --git a/tests/spec/arb_vertex_program/vp-min.shader_test b/tests/spec/arb_vertex_program/vp-min.shader_test
index 45e8ca7..7c49f00 100644
--- a/tests/spec/arb_vertex_program/vp-min.shader_test
+++ b/tests/spec/arb_vertex_program/vp-min.shader_test
@@ -4,7 +4,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -18,11 +17,6 @@ MIN temp1, temp1, temp2;
ADD result.color, temp1, {0.0, 0.0, 1.25, 1.25};
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 1.0 1.0 1.0 1.0
diff --git a/tests/spec/arb_vertex_program/vp-sge-alias.shader_test b/tests/spec/arb_vertex_program/vp-sge-alias.shader_test
index a4e601b..86783a8 100644
--- a/tests/spec/arb_vertex_program/vp-sge-alias.shader_test
+++ b/tests/spec/arb_vertex_program/vp-sge-alias.shader_test
@@ -4,7 +4,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -15,11 +14,6 @@ SGE temp, temp, {2, 1, 0, -1};
MOV result.color, temp;
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 0.0 1.0 0.0 0.0
diff --git a/tests/spec/arb_vertex_program/vp-two-constants.shader_test b/tests/spec/arb_vertex_program/vp-two-constants.shader_test
index fc28701..1efd50e 100644
--- a/tests/spec/arb_vertex_program/vp-two-constants.shader_test
+++ b/tests/spec/arb_vertex_program/vp-two-constants.shader_test
@@ -7,7 +7,6 @@
[require]
GL >= 1.3
ARB_vertex_program
-ARB_fragment_program
[vertex program]
!!ARBvp1.0
@@ -15,11 +14,6 @@ OPTION ARB_position_invariant;
ADD result.color, {1, 0, .25, 0}, {0.5, 0, 1, 0};
END
-[fragment program]
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
[test]
ortho 0 1 0 1
clear color 0.0 1.0 0.0 1.0
--
2.4.9
More information about the Piglit
mailing list