[PATCH 10/10] wined3d: Report a few more ddraw surface caps on 3D devices.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 6 ++++-- dlls/ddraw/tests/ddraw2.c | 6 ++++-- dlls/ddraw/tests/ddraw4.c | 6 ++++-- dlls/ddraw/tests/ddraw7.c | 6 ++++-- dlls/wined3d/adapter_gl.c | 7 ++++++- dlls/wined3d/adapter_vk.c | 6 +++++- 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e7bd9e13acd..acf8dd8e2f0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12950,7 +12950,8 @@ static void test_caps(void) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -12979,7 +12980,8 @@ static void test_caps(void) ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index db0a39df87c..33bc94326fa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13827,7 +13827,8 @@ static void test_caps(void) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -13859,7 +13860,8 @@ static void test_caps(void) ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c182abf3a3f..567a8f38c01 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16388,7 +16388,8 @@ static void test_caps(void) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -16420,7 +16421,8 @@ static void test_caps(void) ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 48121b6563e..4027c722190 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16360,7 +16360,8 @@ static void test_caps(void) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -16389,7 +16390,8 @@ static void test_caps(void) ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw7_Release(ddraw); diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 12879232613..d32b66480a6 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4372,9 +4372,14 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s const struct wined3d_gl_info *gl_info = &adapter->gl_info; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_COMPLEX | WINEDDSCAPS_FRONTBUFFER | WINEDDSCAPS_3DDEVICE - | WINEDDSCAPS_VIDEOMEMORY; + | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_OWNDC + | WINEDDSCAPS_LOCALVIDMEM + | WINEDDSCAPS_NONLOCALVIDMEM; + caps->ddraw_caps.caps |= WINEDDCAPS_3D; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f869318637e..c3a1832e353 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -298,9 +298,13 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s BOOL sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_COMPLEX | WINEDDSCAPS_FRONTBUFFER | WINEDDSCAPS_3DDEVICE - | WINEDDSCAPS_VIDEOMEMORY; + | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_OWNDC + | WINEDDSCAPS_LOCALVIDMEM + | WINEDDSCAPS_NONLOCALVIDMEM; caps->ddraw_caps.caps |= WINEDDCAPS_3D; caps->Caps2 |= WINED3DCAPS2_CANGENMIPMAP; -- 2.11.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55359 Your paranoid android. === wvistau64_zh_CN (32 bit report) === ddraw: ddraw1.c:2801: Test failed: Expected message 0x46, but didn't receive it. ddraw1.c:2803: Test failed: Expected screen size 1024x768, got 0x0. ddraw1.c:2809: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2839: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2846: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2872: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2895: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2924: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2950: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2970: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3006: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3016: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3042: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3065: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3087: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3113: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3133: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3170: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). === wvistau64_he (task log) === Task errors: The previous 1 run(s) terminated abnormally === w864 (64 bit report) === ddraw: ddraw1.c:12985: Test failed: Got unexpected caps 0x421350. ddraw1.c:12991: Test failed: Got unexpected hr 0x80004005. 07b4:ddraw1: unhandled exception c0000005 at 0000000000416F14 === w1064v1507 (64 bit report) === ddraw: ddraw1.c:12985: Test failed: Got unexpected caps 0x421350. ddraw1.c:12991: Test failed: Got unexpected hr 0x80004005. 0a20:ddraw1: unhandled exception c0000005 at 0000000000416F14 === w1064v1809 (64 bit report) === ddraw: ddraw1.c:12985: Test failed: Got unexpected caps 0x421350. ddraw1.c:12991: Test failed: Got unexpected hr 0x80004005. 171c:ddraw1: unhandled exception c0000005 at 0000000000416F14 === wvistau64_zh_CN (32 bit report) === ddraw: ddraw2.c:2912: Test failed: Expected message 0x46, but didn't receive it. ddraw2.c:2914: Test failed: Expected screen size 1024x768, got 0x0. ddraw2.c:2920: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:2950: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:2957: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:2983: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3006: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3035: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3061: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3081: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3117: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3127: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3153: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3176: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3198: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3224: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3244: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw2.c:3281: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). === wvistau64_fr (task log) === Task errors: The previous 1 run(s) terminated abnormally === w864 (64 bit report) === ddraw: ddraw2.c:13865: Test failed: Got unexpected caps 0x421350. ddraw2.c:13871: Test failed: Got unexpected hr 0x80004005. 07c0:ddraw2: unhandled exception c0000005 at 000000000044C32F === w1064v1507 (64 bit report) === ddraw: ddraw2.c:13865: Test failed: Got unexpected caps 0x421350. ddraw2.c:13871: Test failed: Got unexpected hr 0x80004005. 0250:ddraw2: unhandled exception c0000005 at 000000000044C32F === w1064v1809 (64 bit report) === ddraw: ddraw2.c:13865: Test failed: Got unexpected caps 0x421350. ddraw2.c:13871: Test failed: Got unexpected hr 0x80004005. 1418:ddraw2: unhandled exception c0000005 at 000000000044C32F === wvistau64_fr (task log) === Task errors: The previous 1 run(s) terminated abnormally === w8 (32 bit report) === ddraw: ddraw4.c:3362: Test failed: Failed to create surface, hr 0x887601c2. 0c7c:ddraw4: unhandled exception c0000005 at 004C76F6 === wvistau64_zh_CN (32 bit report) === ddraw: ddraw7.c:2740: Test failed: Expected message 0x46, but didn't receive it. ddraw7.c:2742: Test failed: Expected screen size 1024x768, got 0x0. ddraw7.c:2748: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2778: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2785: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2811: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2834: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2856: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2882: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2902: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2938: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2948: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2974: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:2997: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:3019: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:3045: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:3065: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw7.c:3102: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). === wvistau64_he (task log) === Task errors: The previous 1 run(s) terminated abnormally === w1064v1809 (32 bit report) === ddraw: 1744:ddraw7: unhandled exception c0000005 at 733C40F8 === debian10 (32 bit report) === ddraw: ddraw1: Timeout ddraw2: Timeout ddraw4: Timeout ddraw7: Timeout === debian10 (build log) === Task: WineTest did not produce the win32_fr_FR report === debian10 (32 bit WoW report) === ddraw: ddraw1: Timeout ddraw2: Timeout ddraw4: Timeout ddraw7: Timeout === debian10 (build log) === Task: WineTest did not produce the wow64 report
participants (2)
-
Henri Verbeet -
Marvin