Skip to content

W
wine-winehq
Commit 2a258bd0 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3d8/tests: Handle the Windows 8 testbot results in cnd_test().

parent 41abcf60
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
dlls/d3d8/tests/visual.c
View file @ 2a258bd0
...@@ -1463,7 +1463,9 @@ static void cnd_test(void) ...@@ -1463,7 +1463,9 @@ static void cnd_test(void)
hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);
ok(hr == D3D_OK, "IDirect3DDevice8_Present failed with %08x\n", hr); ok(hr == D3D_OK, "IDirect3DDevice8_Present failed with %08x\n", hr);
/* Retest with the coissue flag on the alpha instruction instead. This works "as expected". */ /* Retest with the coissue flag on the alpha instruction instead. This
* works "as expected". The Windows 8 testbot (WARP) seems to handle this
* the same as coissue on .rgb. */
hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0f, 0); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0f, 0);
ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %08x\n", hr); ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %08x\n", hr);
...@@ -1505,13 +1507,13 @@ static void cnd_test(void) ...@@ -1505,13 +1507,13 @@ static void cnd_test(void)
/* 1.1 shader */ /* 1.1 shader */
color = getPixelColor(device, 238, 358); color = getPixelColor(device, 238, 358);
ok(color_match(color, 0x00ffffff, 1), ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)),
"pixel 238, 358 has color %08x, expected 0x00ffffff\n", color); "pixel 238, 358 has color %08x, expected 0x00ffffff\n", color);
color = getPixelColor(device, 242, 358); color = getPixelColor(device, 242, 358);
ok(color_match(color, 0x00000000, 1), ok(color_match(color, 0x00000000, 1),
"pixel 242, 358 has color %08x, expected 0x00000000\n", color); "pixel 242, 358 has color %08x, expected 0x00000000\n", color);
color = getPixelColor(device, 238, 362); color = getPixelColor(device, 238, 362);
ok(color_match(color, 0x00ffffff, 1), ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)),
"pixel 238, 362 has color %08x, expected 0x00ffffff\n", color); "pixel 238, 362 has color %08x, expected 0x00ffffff\n", color);
color = getPixelColor(device, 242, 362); color = getPixelColor(device, 242, 362);
ok(color_match(color, 0x00000000, 1), ok(color_match(color, 0x00000000, 1),
...@@ -1519,13 +1521,13 @@ static void cnd_test(void) ...@@ -1519,13 +1521,13 @@ static void cnd_test(void)
/* 1.2 shader */ /* 1.2 shader */
color = getPixelColor(device, 558, 358); color = getPixelColor(device, 558, 358);
ok(color_match(color, 0x00ffffff, 1), ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)),
"pixel 558, 358 has color %08x, expected 0x00ffffff\n", color); "pixel 558, 358 has color %08x, expected 0x00ffffff\n", color);
color = getPixelColor(device, 562, 358); color = getPixelColor(device, 562, 358);
ok(color_match(color, 0x00000000, 1), ok(color_match(color, 0x00000000, 1),
"pixel 562, 358 has color %08x, expected 0x00000000\n", color); "pixel 562, 358 has color %08x, expected 0x00000000\n", color);
color = getPixelColor(device, 558, 362); color = getPixelColor(device, 558, 362);
ok(color_match(color, 0x00ffffff, 1), ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)),
"pixel 558, 362 has color %08x, expected 0x00ffffff\n", color); "pixel 558, 362 has color %08x, expected 0x00ffffff\n", color);
color = getPixelColor(device, 562, 362); color = getPixelColor(device, 562, 362);
ok(color_match(color, 0x00000000, 1), ok(color_match(color, 0x00000000, 1),
...@@ -1533,13 +1535,13 @@ static void cnd_test(void) ...@@ -1533,13 +1535,13 @@ static void cnd_test(void)
/* 1.3 shader */ /* 1.3 shader */
color = getPixelColor(device, 558, 118); color = getPixelColor(device, 558, 118);
ok(color_match(color, 0x00ffffff, 1), ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)),
"pixel 558, 118 has color %08x, expected 0x00ffffff\n", color); "pixel 558, 118 has color %08x, expected 0x00ffffff\n", color);
color = getPixelColor(device, 562, 118); color = getPixelColor(device, 562, 118);
ok(color_match(color, 0x00000000, 1), ok(color_match(color, 0x00000000, 1),
"pixel 562, 118 has color %08x, expected 0x00000000\n", color); "pixel 562, 118 has color %08x, expected 0x00000000\n", color);
color = getPixelColor(device, 558, 122); color = getPixelColor(device, 558, 122);
ok(color_match(color, 0x00ffffff, 1), ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)),
"pixel 558, 122 has color %08x, expected 0x00ffffff\n", color); "pixel 558, 122 has color %08x, expected 0x00ffffff\n", color);
color = getPixelColor(device, 562, 122); color = getPixelColor(device, 562, 122);
ok(color_match(color, 0x00000000, 1), ok(color_match(color, 0x00000000, 1),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment