Matteo Bruni : d3d9/tests: Accept new WARP test failure in test_updatetexture().
Alexandre Julliard
julliard at winehq.org
Fri Dec 4 14:36:04 CST 2020
Module: wine
Branch: master
Commit: b7eeab900f38ae67e7a63c0f46c61201a3753215
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7eeab900f38ae67e7a63c0f46c61201a3753215
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Thu Dec 3 17:58:56 2020 +0100
d3d9/tests: Accept new WARP test failure in test_updatetexture().
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/tests/visual.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 99896b8c624..40585d5257d 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -21754,7 +21754,7 @@ static void test_updatetexture(void)
UINT dst_width, dst_height;
UINT src_levels, dst_levels;
D3DFORMAT src_format, dst_format;
- BOOL broken;
+ BOOL broken_result, broken_updatetex;
}
tests[] =
{
@@ -21772,7 +21772,8 @@ static void test_updatetexture(void)
* one or something like that). */
/* {8, 8, 7, 7, 4, 2, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */
{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
* of the texture memory). */
/* {8, 8, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */
@@ -22015,7 +22016,8 @@ static void test_updatetexture(void)
hr = IDirect3DDevice9_UpdateTexture(device, src, dst);
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(dst);
continue;
@@ -22039,7 +22041,7 @@ static void test_updatetexture(void)
ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
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. */
"Got unexpected color 0x%08x, case %u, %u.\n", color, t, i);
}
More information about the wine-cvs
mailing list