system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 22:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ddraw/tests: Accept broken depth readback of new-ish AMD GPUs.

Browse source 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Stefan Dösinger 2022-01-24 15:20:29 +03:00 committed by Alexandre Julliard
parent 9d1ac957b4
commit 917e8dbf67
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/ddraw/tests/ddraw2.c
View file

@ -148,6 +148,11 @@ static BOOL ddraw_is_vendor(IDirectDraw2 *ddraw, DWORD vendor)
&& identifier.dwVendorId == vendor;
}
static BOOL ddraw_is_amd(IDirectDraw2 *ddraw)
{
return ddraw_is_vendor(ddraw, 0x1002);
}
static BOOL ddraw_is_intel(IDirectDraw2 *ddraw)
{
return ddraw_is_vendor(ddraw, 0x8086);
@ -13640,7 +13645,8 @@ static void test_depth_readback(void)
/* The ddraw2 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs,
* except that we only have D16 (broken on geforce 9) and D24X8 (broken on geforce 7) available.
* Accept all nvidia GPUs as broken here, but still expect one of the formats to pass. */
ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw),
ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw)
|| (ddraw_is_amd(ddraw) && tests[i].z_depth == 24),
"Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n",
i, depth, expected_depth - depth, expected_depth, max_diff, x, y);
if (!compare_uint(expected_depth, depth, max_diff))

8
dlls/ddraw/tests/ddraw4.c
View file

@ -149,6 +149,11 @@ static BOOL ddraw_is_vendor(IDirectDraw4 *ddraw, DWORD vendor)
&& identifier.dwVendorId == vendor;
}
static BOOL ddraw_is_amd(IDirectDraw4 *ddraw)
{
return ddraw_is_vendor(ddraw, 0x1002);
}
static BOOL ddraw_is_intel(IDirectDraw4 *ddraw)
{
return ddraw_is_vendor(ddraw, 0x8086);
@ -16252,7 +16257,8 @@ static void test_depth_readback(void)
*
* Some of the tested places pass on some GPUs on Wine by accident. */
todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff))
ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw),
ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw)
|| (ddraw_is_amd(ddraw) && !tests[i].s_depth && tests[i].z_mask == 0x00ffffff),
"Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n",
i, depth, expected_depth - depth, expected_depth, max_diff, x, y);
if (!compare_uint(expected_depth, depth, max_diff))

9
dlls/ddraw/tests/ddraw7.c
View file

@ -15716,7 +15716,8 @@ static void test_depth_readback(void)
depth = raw_value & tests[i].z_mask;
expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask;
max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask;
/* This test is very reliably on AMD, but fails in a number of interesting ways on Nvidia GPUs:
/* This test is very reliably on older AMD drivers, but fails in a number of interesting
* ways on Nvidia GPUs:
*
* Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data.
*
@ -15729,10 +15730,14 @@ static void test_depth_readback(void)
* Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654).
* The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7.
*
* On new-ish AMD GPUs (Radeon Polaris at least) returns weird data for D24 and D24X8. D16
* and D24S8 work.
*
* Some of the tested places pass on some GPUs on Wine by accident. */
todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff))
ok(compare_uint(expected_depth, depth, max_diff)
|| (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)),
|| (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth))
|| (ddraw_is_amd(ddraw) && !tests[i].s_depth && tests[i].z_mask == 0x00ffffff),
"Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n",
i, depth, expected_depth - depth, expected_depth, max_diff, x, y);
if (!compare_uint(expected_depth, depth, max_diff))