This commit was autogenerated by Python and Bash scripting. Then, I manually squashed in a fix to all.py to delete the empty group, to prevent syntax errors. --- tests/all.py | 5 ----- .../fp-arb-fragment-coord-conventions-none.vpfp | 14 ------------- ...arb-fragment-coord-conventions-none.shader_test | 24 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 19 deletions(-) delete mode 100644 tests/shaders/generic/fp-arb-fragment-coord-conventions-none.vpfp create mode 100644 tests/spec/arb_fragment_coord_conventions/fp-arb-fragment-coord-conventions-none.shader_test
diff --git a/tests/all.py b/tests/all.py index 9ea476b..a4d6599 100644 --- a/tests/all.py +++ b/tests/all.py @@ -1920,11 +1920,6 @@ with profile.group_manager( with profile.group_manager( PiglitGLTest, - grouptools.join('spec', 'arb_fragment_coord_conventions')) as g: - add_vpfpgeneric(g, 'fp-arb-fragment-coord-conventions-none') - -with profile.group_manager( - PiglitGLTest, grouptools.join('spec', 'ATI_fragment_shader')) as g: g(['ati-fs-bad-delete']) diff --git a/tests/shaders/generic/fp-arb-fragment-coord-conventions-none.vpfp b/tests/shaders/generic/fp-arb-fragment-coord-conventions-none.vpfp deleted file mode 100644 index 3674a36..0000000 --- a/tests/shaders/generic/fp-arb-fragment-coord-conventions-none.vpfp +++ /dev/null @@ -1,14 +0,0 @@ -; Tests the pixel center choice in the absence of -; ARB_fragment_coord_conventions use. - -!!ARBvp1.0 -OPTION ARB_position_invariant; -END - -!!ARBfp1.0 -MOV result.color, {0.0, 0.0, 0.0, 0.0}; -FRC result.color.xy, fragment.position; -END - -!!test -expected 0.5 0.5 0.0 0.0 diff --git a/tests/spec/arb_fragment_coord_conventions/fp-arb-fragment-coord-conventions-none.shader_test b/tests/spec/arb_fragment_coord_conventions/fp-arb-fragment-coord-conventions-none.shader_test new file mode 100644 index 0000000..7023ae9 --- /dev/null +++ b/tests/spec/arb_fragment_coord_conventions/fp-arb-fragment-coord-conventions-none.shader_test @@ -0,0 +1,24 @@ +# Tests the pixel center choice in the absence of +# ARB_fragment_coord_conventions use. + +[require] +GL >= 1.3 +ARB_vertex_program +ARB_fragment_program + +[vertex program] +!!ARBvp1.0 +OPTION ARB_position_invariant; +END + +[fragment program] +!!ARBfp1.0 +MOV result.color, {0.0, 0.0, 0.0, 0.0}; +FRC result.color.xy, fragment.position; +END + +[test] +ortho 0 1 0 1 +draw rect 0 0 1 1 +probe all rgba 0.5 0.5 0.0 0.0 + -- 2.4.2 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit