[PATCH v2 0/3] MR10332: ddraw/tests: Fix vertex winding in test_ck_rgba.
On recent Windows 11 versions, probably starting with 26H1, RGB software devices accidentally enable culling by default for transformed geometry. Since this test is run on RGB in addition to HAL devices that causes failues. HAL devices are fine either way, and ddraw2+ looks OK too. -- v2: ddraw/tests: Fix vertex winding in test_texture_wrong_caps. ddraw/tests: Fix vertex winding in test_zenable. ddraw/tests: Fix vertex winding in test_ck_rgba. https://gitlab.winehq.org/wine/wine/-/merge_requests/10332
From: Stefan Dösinger <stefan@codeweavers.com> On recent Windows 11 versions, probably starting with 26H1, RGB software devices accidentally enable culling by default for transformed geometry. Since this test is run on RGB in addition to HAL devices that causes failues. HAL devices are fine either way, and ddraw2+ looks OK too. --- dlls/ddraw/tests/ddraw1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7d8456bb746..6684be92b63 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1810,14 +1810,14 @@ static void test_ck_rgba(const GUID *device_guid) static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static D3DTLVERTEX tquad[] = { - {{ 0.0f}, {480.0f}, {0.25f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, {{ 0.0f}, { 0.0f}, {0.25f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {1.0f}}, - {{640.0f}, {480.0f}, {0.25f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, {{640.0f}, { 0.0f}, {0.25f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, - {{ 0.0f}, {480.0f}, {0.75f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, {480.0f}, {0.25f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, {480.0f}, {0.25f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, {{ 0.0f}, { 0.0f}, {0.75f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {1.0f}}, - {{640.0f}, {480.0f}, {0.75f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, {{640.0f}, { 0.0f}, {0.75f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, + {{ 0.0f}, {480.0f}, {0.75f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, {480.0f}, {0.75f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, }; /* Supposedly there was no D3DRENDERSTATE_COLORKEYENABLE in D3D < 5. * Maybe the WARP driver on Windows 8 ignores setting it via the older -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10332
From: Stefan Dösinger <stefan@codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6684be92b63..db451884230 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1719,10 +1719,10 @@ static void test_zenable(const GUID *device_guid) static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static D3DTLVERTEX tquad[] = { - {{ 0.0f}, {480.0f}, {-0.5f}, {1.0f}, {0xff00ff00}, {0x00000000}, {0.0f}, {0.0f}}, {{ 0.0f}, { 0.0f}, {-0.5f}, {1.0f}, {0xff00ff00}, {0x00000000}, {0.0f}, {0.0f}}, - {{640.0f}, {480.0f}, { 1.5f}, {1.0f}, {0xff00ff00}, {0x00000000}, {0.0f}, {0.0f}}, {{640.0f}, { 0.0f}, { 1.5f}, {1.0f}, {0xff00ff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, {480.0f}, {-0.5f}, {1.0f}, {0xff00ff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, {480.0f}, { 1.5f}, {1.0f}, {0xff00ff00}, {0x00000000}, {0.0f}, {0.0f}}, }; unsigned int inst_length, color, x, y, i, j; IDirect3DExecuteBuffer *execute_buffer; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10332
From: Stefan Dösinger <stefan@codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index db451884230..80b3b60c716 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14971,10 +14971,10 @@ static void test_texture_wrong_caps(const GUID *device_guid) { static D3DTLVERTEX quad[] = { - {{ 0.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, {{ 0.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {1.0f}}, - {{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, {{640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, + {{ 0.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, }; static DDPIXELFORMAT fmt = { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10332
This merge request was approved by Elizabeth Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10332
participants (2)
-
Elizabeth Figura (＠zfigura) -
Stefan Dösinger