diff options
| -rw-r--r-- | tests/all.py | 1 | ||||
| -rw-r--r-- | tests/shaders/generic/vp-two-constants.vpfp | 18 | ||||
| -rw-r--r-- | tests/spec/arb_vertex_program/vp-two-constants.shader_test | 29 |
3 files changed, 29 insertions, 19 deletions
diff --git a/tests/all.py b/tests/all.py index a8dbab8e8..e658f5e22 100644 --- a/tests/all.py +++ b/tests/all.py @@ -2594,7 +2594,6 @@ with profile.group_manager( g(['vp-address-04'], run_concurrent=False) g(['vp-bad-program'], run_concurrent=False) g(['vp-max-array'], run_concurrent=False) - add_vpfpgeneric(g, 'vp-two-constants') with profile.group_manager( PiglitGLTest, diff --git a/tests/shaders/generic/vp-two-constants.vpfp b/tests/shaders/generic/vp-two-constants.vpfp deleted file mode 100644 index 3bb5a97e9..000000000 --- a/tests/shaders/generic/vp-two-constants.vpfp +++ /dev/null @@ -1,18 +0,0 @@ -; Detects whether or not the implementation correctly handles having two -; constants in the same operand. -; -; This is a potential issue with gen4, and is something we should probably -; make the optimizer handle. - -!!ARBvp1.0 -OPTION ARB_position_invariant; -ADD result.color, {1, 0, .25, 0}, {0.5, 0, 1, 0}; -END - -!!ARBfp1.0 -MOV result.color, fragment.color; -END - -!!test -expected 1.0 0.0 1.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 new file mode 100644 index 000000000..fc287010e --- /dev/null +++ b/tests/spec/arb_vertex_program/vp-two-constants.shader_test @@ -0,0 +1,29 @@ +# Detects whether or not the implementation correctly handles having two +# constants in the same operand. +# +# This is a potential issue with gen4, and is something we should probably +# make the optimizer handle. + +[require] +GL >= 1.3 +ARB_vertex_program +ARB_fragment_program + +[vertex program] +!!ARBvp1.0 +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 +clear +draw rect 0 0 1 1 +probe all rgba 1.0 0.0 1.0 0.0 + |