[PATCH 0/2] MR2717: d3d9/tests: AMD GPUs sample the border color of cube textures.
--- This must be the longest ignored d3d test failure. I think my r200 GPU does not show this behavior, but my r500 one does. I'll be able to check next week if anyone cares. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2717
From: Stefan Dösinger <stefan(a)codeweavers.com> --- This must be the longest ignored d3d test failure. I think my r200 GPU does not show this behavior, but my r500 one does. I'll be able to check next week if anyone cares. --- dlls/d3d9/tests/visual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 23e22c2340f..e70ce7b4b7c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2808,7 +2808,10 @@ static void test_cube_wrap(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 1), + /* Modern AMD GPUs do slip into reading the border color. */ + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 1) + || broken(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xbf, 0x40), 1) + && address_modes[x].mode == D3DTADDRESS_BORDER), "Got color 0x%08x for addressing mode %s, expected 0x000000ff.\n", color, address_modes[x].name); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2717
From: Stefan Dösinger <stefan(a)codeweavers.com> See e.g. http://test.winehq.org/data/a500bb72f05058c985511ff35f191565f45cd6c0/win22H2... . --- At this point the 3D texture with 2D sampler test says relatively little, other than "it doesn't crash" and "if the driver invents a value that is not in the texture, it invents zero". --- dlls/d3d9/tests/visual.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e70ce7b4b7c..b50b1a22772 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26468,10 +26468,10 @@ static void test_mismatched_sample_types(void) static IDirect3DVolumeTexture9 *volume; IDirect3DVertexShader9 *vertex_shader; static IDirect3DTexture9 *tex_2d; + unsigned int colour, i, r, g, b; D3DLOCKED_RECT locked_rect; D3DLOCKED_BOX locked_box; IDirect3DDevice9 *device; - unsigned int colour, i; IDirect3D9 *d3d; ULONG refcount; D3DCAPS9 caps; @@ -26540,21 +26540,22 @@ static void test_mismatched_sample_types(void) static DWORD ps_code[ARRAY_SIZE(ps_header) + TEST_MISMATCHED_SAMPLE_BODY_WORDS + ARRAY_SIZE(ps_footer)]; +#define SAMPLE_ZERO 0x1 +#define RANDOM_W 0x2 static const struct { const char *name; IDirect3DBaseTexture9 **texture; IDirect3DPixelShader9 **pixel_shader; unsigned int expected_colour; - unsigned int expected_broken; - unsigned int expected_broken2; + unsigned int broken; } tests[] = { {"2d_2d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_2d, 0x00707070}, {"3d_3d", (IDirect3DBaseTexture9 **)&volume, &ps_3d, 0x00303030}, - {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, 0x00b2cce5}, - {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, 0x00b2cce5, 0x00202020}, + {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, SAMPLE_ZERO}, + {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, SAMPLE_ZERO | RANDOM_W}, }; window = create_window(); @@ -26651,10 +26652,17 @@ static void test_mismatched_sample_types(void) colour = getPixelColor(device, 320, 240); + /* If texld returns zero, the test writes vec4(0.7, 0.8, 0.9, 0.0) - 0x00b2cce5. + * + * When sampling the 3D texture with a 2D sampler, most drivers sample at the depth + * coordinate we provide (0.5), but some use 0.0, while my radeon GPU uses 0.89. */ + r = (colour & 0x00ff0000) >> 16; + g = (colour & 0x0000ff00) >> 8; + b = (colour & 0x000000ff); todo_wine_if(!color_match(colour, tests[i].expected_colour, 1)) ok(color_match(colour, tests[i].expected_colour, 1) - || broken(tests[i].expected_broken && color_match(colour, tests[i].expected_broken, 1)) - || broken(tests[i].expected_broken2 && color_match(colour, tests[i].expected_broken2, 1)), + || broken((tests[i].broken & SAMPLE_ZERO) && color_match(colour, 0x00b2cce5, 1)) + || broken((tests[i].broken & RANDOM_W) && r >= 0x1f && r <= 0x41 && r == g && r == b), "test %s, expected 0x%08x, got 0x%08x.\n", tests[i].name, tests[i].expected_colour, colour); } @@ -26674,6 +26682,9 @@ done: ok(!refcount, "Device has %lu references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); + +#undef SAMPLE_ZERO +#undef RANDOM_W } static void test_draw_mapped_buffer(void) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2717
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2717
participants (2)
-
Stefan Dösinger -
Zebediah Figura (＠zfigura)