Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com> --- tests/all.py | 1 - tests/glean/tfragprog1.cpp | 13 ------------- tests/spec/arb_fragment_program/built-in-functions/dp4.shader_test | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 tests/spec/arb_fragment_program/built-in-functions/dp4.shader_test
diff --git a/tests/all.py b/tests/all.py index 8132bbb..0058af6 100644 --- a/tests/all.py +++ b/tests/all.py @@ -376,7 +376,6 @@ glean_glsl_tests = ['Primary plus secondary color', 'texcoord varying'] glean_fp_tests = [ - 'DP4 test', 'DPH test', 'DST test', 'EX2 test', diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp index bf95a20..0028b39 100644 --- a/tests/glean/tfragprog1.cpp +++ b/tests/glean/tfragprog1.cpp @@ -82,19 +82,6 @@ static GLfloat FogCoord = 50.0; /* Between FogStart and FogEnd */ // Alphabetical order, please static const FragmentProgram Programs[] = { { - "DP4 test", - "!!ARBfp1.0\n" - "PARAM p1 = program.local[1]; \n" - "DP4 result.color, p1, fragment.color; \n" - "END \n", - { SMEAR(CLAMP01(Param1[0] * FragColor[0] + - Param1[1] * FragColor[1] + - Param1[2] * FragColor[2] + - Param1[3] * FragColor[3])) - }, - DONT_CARE_Z - }, - { "DPH test", "!!ARBfp1.0\n" "PARAM p1 = program.local[1]; \n" diff --git a/tests/spec/arb_fragment_program/built-in-functions/dp4.shader_test b/tests/spec/arb_fragment_program/built-in-functions/dp4.shader_test new file mode 100644 index 0000000..2101639 --- /dev/null +++ b/tests/spec/arb_fragment_program/built-in-functions/dp4.shader_test @@ -0,0 +1,18 @@ +[require] +GL_ARB_fragment_program + +[fragment program] +!!ARBfp1.0 +PARAM p = program.local[0]; +PARAM q = program.local[1]; +DP4 result.color, p, q; +END + +[test] +clear color 1.0 1.0 1.0 1.0 +clear + +parameter local_fp 0 (0.4, 0.6, 0.7, 0.5) +parameter local_fp 1 (0.1, 0.2, 0.3, 0.4) +draw rect -1 -1 2 2 +probe all rgba 0.57 0.57 0.57 0.57 -- git-series 0.8.10 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit