diff options
author | marha <marha@users.sourceforge.net> | 2014-01-05 17:18:15 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-01-05 17:18:15 +0100 |
commit | 0fd65ec557757ec8760a96400a09b8a8a92a7b14 (patch) | |
tree | 961d86d49281cf94e2dc85ffb88c6b1491036338 /pixman/test/blitters-test.c | |
parent | 68c12003597662f95eac07ddeee99637f7caa3e5 (diff) | |
parent | 1b37f71714e2ca4af60bd050adbbb7969534dfd6 (diff) | |
download | vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.gz vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.bz2 vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto libXau libxcb mesa mkfontscale pixman git update 5 Jan 2014
Diffstat (limited to 'pixman/test/blitters-test.c')
-rw-r--r-- | pixman/test/blitters-test.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pixman/test/blitters-test.c b/pixman/test/blitters-test.c index df8235841..026f4b006 100644 --- a/pixman/test/blitters-test.c +++ b/pixman/test/blitters-test.c @@ -122,6 +122,15 @@ static pixman_op_t op_list[] = { PIXMAN_OP_ATOP_REVERSE, PIXMAN_OP_XOR, PIXMAN_OP_ADD, + PIXMAN_OP_MULTIPLY, + PIXMAN_OP_SCREEN, + PIXMAN_OP_OVERLAY, + PIXMAN_OP_DARKEN, + PIXMAN_OP_LIGHTEN, + PIXMAN_OP_HARD_LIGHT, + PIXMAN_OP_DIFFERENCE, + PIXMAN_OP_EXCLUSION, +#if 0 /* these use floating point math and are not always bitexact on different platforms */ PIXMAN_OP_SATURATE, PIXMAN_OP_DISJOINT_CLEAR, PIXMAN_OP_DISJOINT_SRC, @@ -147,17 +156,8 @@ static pixman_op_t op_list[] = { PIXMAN_OP_CONJOINT_ATOP, PIXMAN_OP_CONJOINT_ATOP_REVERSE, PIXMAN_OP_CONJOINT_XOR, - PIXMAN_OP_MULTIPLY, - PIXMAN_OP_SCREEN, - PIXMAN_OP_OVERLAY, - PIXMAN_OP_DARKEN, - PIXMAN_OP_LIGHTEN, PIXMAN_OP_COLOR_DODGE, PIXMAN_OP_COLOR_BURN, - PIXMAN_OP_HARD_LIGHT, - PIXMAN_OP_DIFFERENCE, - PIXMAN_OP_EXCLUSION, -#if 0 /* these use floating point math and are not always bitexact on different platforms */ PIXMAN_OP_SOFT_LIGHT, PIXMAN_OP_HSL_HUE, PIXMAN_OP_HSL_SATURATION, @@ -394,6 +394,6 @@ main (int argc, const char *argv[]) } return fuzzer_test_main("blitters", 2000000, - 0x63B4E3F3, + 0xCC21DDF0, test_composite, argc, argv); } |