Module: wine Branch: master Commit: 0190b6cb901a66dbdadf3d5cfeb1eaf3b8a29729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0190b6cb901a66dbdadf3d5cfe...
Author: Stefan Dösinger stefan@codeweavers.com Date: Sat Jul 3 16:13:31 2010 +0200
d3d9: Use color_match in the coissue tests.
---
dlls/d3d9/tests/visual.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 502d40b..0168222 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5389,44 +5389,44 @@ static void cnd_test(IDirect3DDevice9 *device)
/* 1.1 shader. coissue flag changed the semantic of cnd, c1 is always selected */ color = getPixelColor(device, 158, 358); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 158, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 358); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 162, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 158, 362); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 158, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 362); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 162, 362 has color %08x, expected 0x0000ff00\n", color);
/* 1.2 shader */ color = getPixelColor(device, 478, 358); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 478, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 358); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 482, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 362); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 478, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 362); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 482, 362 has color %08x, expected 0x0000ff00\n", color);
/* 1.3 shader */ color = getPixelColor(device, 478, 118); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 478, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 118); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 482, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 122); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 478, 122 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 122); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 482, 122 has color %08x, expected 0x0000ff00\n", color);
hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);