Commit b7eeab90 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard

d3d9/tests: Accept new WARP test failure in test_updatetexture().

parent 53d95529
...@@ -21754,7 +21754,7 @@ static void test_updatetexture(void) ...@@ -21754,7 +21754,7 @@ static void test_updatetexture(void)
UINT dst_width, dst_height; UINT dst_width, dst_height;
UINT src_levels, dst_levels; UINT src_levels, dst_levels;
D3DFORMAT src_format, dst_format; D3DFORMAT src_format, dst_format;
BOOL broken; BOOL broken_result, broken_updatetex;
} }
tests[] = tests[] =
{ {
...@@ -21772,7 +21772,8 @@ static void test_updatetexture(void) ...@@ -21772,7 +21772,8 @@ static void test_updatetexture(void)
* one or something like that). */ * one or something like that). */
/* {8, 8, 7, 7, 4, 2, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */ /* {8, 8, 7, 7, 4, 2, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */
{8, 8, 8, 8, 1, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 8 */ {8, 8, 8, 8, 1, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 8 */
{4, 4, 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 9 */ /* For this one UpdateTexture() returns failure on WARP on > Win 10 1709. */
{4, 4, 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, TRUE}, /* 9 */
/* This one causes weird behavior on Windows (it probably writes out /* This one causes weird behavior on Windows (it probably writes out
* of the texture memory). */ * of the texture memory). */
/* {8, 8, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */ /* {8, 8, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */
...@@ -22015,7 +22016,8 @@ static void test_updatetexture(void) ...@@ -22015,7 +22016,8 @@ static void test_updatetexture(void)
hr = IDirect3DDevice9_UpdateTexture(device, src, dst); hr = IDirect3DDevice9_UpdateTexture(device, src, dst);
if (FAILED(hr)) if (FAILED(hr))
{ {
todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u, %u.\n", hr, t, i); todo_wine ok(SUCCEEDED(hr) || broken(tests[i].broken_updatetex),
"Failed to update texture, hr %#x, case %u, %u.\n", hr, t, i);
IDirect3DBaseTexture9_Release(src); IDirect3DBaseTexture9_Release(src);
IDirect3DBaseTexture9_Release(dst); IDirect3DBaseTexture9_Release(dst);
continue; continue;
...@@ -22039,7 +22041,7 @@ static void test_updatetexture(void) ...@@ -22039,7 +22041,7 @@ static void test_updatetexture(void)
ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
color = getPixelColor(device, 320, 240); color = getPixelColor(device, 320, 240);
ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken) ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken_result)
|| broken(color == 0x00adbeef), /* WARP device often just breaks down. */ || broken(color == 0x00adbeef), /* WARP device often just breaks down. */
"Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i);
} }
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