[PATCH v2 0/3] MR1865: wined3d: Load and invalidate every mipmap level when mapping the top mipmap level.

List overview All Threads

newer

older

[PATCH 0/2] MR1867: Better handle...

[PATCH 0/3] MR1865: wined3d: Load...

Zebediah Figura (＠zfigura)

21 Dec 2022 21 Dec '22

12:09 a.m.

-- v2: wined3d: Load and invalidate every mipmap level when mapping the top mipmap level. d3d8/tests: Test uploading the whole mipmap chain in one map. d3d9/tests: Test uploading the whole mipmap chain in one map.

https://gitlab.winehq.org/wine/wine/-/merge_requests/1865

Show replies by date

Zebediah Figura

21 Dec 21 Dec

12:09 a.m.

New subject: [PATCH v2 1/3] d3d9/tests: Test uploading the whole mipmap chain in one map.

From: Zebediah Figura zfigura@codeweavers.com

--- dlls/d3d9/tests/visual.c | 75 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ccfa8ce5e3a..bf9dcaa788f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -260,6 +260,7 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y)

#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) #define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) +#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c) static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo) { unsigned int color = 0xdeadbeef; @@ -27876,6 +27877,79 @@ static void test_managed_reset(void) release_test_context(&context); }

+/* Some applications lock a mipmapped texture at level 0, write every level at + * once, and expect it to be uploaded. */ +static void test_mipmap_upload(void) +{ + unsigned int i, j, width, level_count; + struct d3d9_test_context context; + IDirect3DTexture9 *texture; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + unsigned int *mem; + HRESULT hr; + + static const D3DPOOL pools[] = + { + D3DPOOL_MANAGED, + D3DPOOL_SYSTEMMEM, + D3DPOOL_SCRATCH, + }; + + if (!init_test_context(&context)) + return; + device = context.device; + + for (i = 0; i < ARRAY_SIZE(pools); ++i) + { + winetest_push_context("pool %#x", pools[i]); + + hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 0, 0, + D3DFMT_A8R8G8B8, pools[i], &texture, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + level_count = IDirect3DBaseTexture9_GetLevelCount(texture); + + hr = IDirect3DTexture9_LockRect(texture, 0, &locked_rect, NULL, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + mem = locked_rect.pBits; + + for (j = 0; j < level_count; ++j) + { + width = 32 >> j; + memset(mem, 0x11 * (j + 1), width * width * 4); + mem += width * width; + } + + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + for (j = 0; j < level_count; ++j) + { + winetest_push_context("level %u", j); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, j); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_textured_quad(&context, texture); + check_rt_color_todo_if(context.backbuffer, 0x00111111 * (j + 1), j > 0); + + winetest_pop_context(); + } + + IDirect3DTexture9_Release(texture); + + winetest_pop_context(); + } + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -28028,4 +28102,5 @@ START_TEST(visual) test_dynamic_map_synchronization(); test_filling_convention(); test_managed_reset(); + test_mipmap_upload(); }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1865

Zebediah Figura

12:09 a.m.

New subject: [PATCH v2 2/3] d3d8/tests: Test uploading the whole mipmap chain in one map.

From: Zebediah Figura zfigura@codeweavers.com

--- dlls/d3d8/tests/visual.c | 75 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+)

diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ea2d96378f7..7f706066aee 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -250,6 +250,7 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message)

#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) #define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) +#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c) static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color, bool todo) { unsigned int color = 0xdeadbeef; @@ -12126,6 +12127,79 @@ static void test_managed_reset(void) release_test_context(&context); }

+/* Some applications lock a mipmapped texture at level 0, write every level at + * once, and expect it to be uploaded. */ +static void test_mipmap_upload(void) +{ + unsigned int i, j, width, level_count; + struct d3d8_test_context context; + IDirect3DTexture8 *texture; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice8 *device; + unsigned int *mem; + HRESULT hr; + + static const D3DPOOL pools[] = + { + D3DPOOL_MANAGED, + D3DPOOL_SYSTEMMEM, + D3DPOOL_SCRATCH, + }; + + if (!init_test_context(&context)) + return; + device = context.device; + + for (i = 0; i < ARRAY_SIZE(pools); ++i) + { + winetest_push_context("pool %#x", pools[i]); + + hr = IDirect3DDevice8_CreateTexture(device, 32, 32, 0, 0, + D3DFMT_A8R8G8B8, pools[i], &texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + level_count = IDirect3DBaseTexture8_GetLevelCount(texture); + + hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, NULL, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + mem = locked_rect.pBits; + + for (j = 0; j < level_count; ++j) + { + width = 32 >> j; + memset(mem, 0x11 * (j + 1), width * width * 4); + mem += width * width; + } + + hr = IDirect3DTexture8_UnlockRect(texture, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + for (j = 0; j < level_count; ++j) + { + winetest_push_context("level %u", j); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, j); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_textured_quad(&context, texture); + check_rt_color_todo_if(context.backbuffer, 0x00111111 * (j + 1), j > 0); + + winetest_pop_context(); + } + + IDirect3DTexture8_Release(texture); + + winetest_pop_context(); + } + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -12208,4 +12282,5 @@ START_TEST(visual) test_dynamic_map_synchronization(); test_filling_convention(); test_managed_reset(); + test_mipmap_upload(); }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1865

Zebediah Figura

12:09 a.m.

New subject: [PATCH v2 3/3] wined3d: Load and invalidate every mipmap level when mapping the top mipmap level.

From: Zebediah Figura zfigura@codeweavers.com

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53743 --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 31 ++++++++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7f706066aee..f077344f1bb 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -12188,7 +12188,7 @@ static void test_mipmap_upload(void) ok(hr == S_OK, "Got hr %#lx.\n", hr);

draw_textured_quad(&context, texture); - check_rt_color_todo_if(context.backbuffer, 0x00111111 * (j + 1), j > 0); + check_rt_color(context.backbuffer, 0x00111111 * (j + 1));

winetest_pop_context(); } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bf9dcaa788f..ab390f7dc8f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27938,7 +27938,7 @@ static void test_mipmap_upload(void) ok(hr == S_OK, "Got hr %#lx.\n", hr);

draw_textured_quad(&context, texture); - check_rt_color_todo_if(context.backbuffer, 0x00111111 * (j + 1), j > 0); + check_rt_color(context.backbuffer, 0x00111111 * (j + 1));

winetest_pop_context(); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bb19ac6183d..8d416494eb8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3697,7 +3697,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour struct wined3d_bo_address data; unsigned int texture_level; BYTE *base_memory; - BOOL ret; + BOOL ret = TRUE;

TRACE("resource %p, sub_resource_idx %u, map_ptr %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_ptr, debug_box(box), flags); @@ -3732,7 +3732,20 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour { if (resource->usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic texture without WINED3D_MAP_DISCARD.\n"); - ret = wined3d_texture_load_location(texture, sub_resource_idx, context, resource->map_binding); + if (!texture_level) + { + unsigned int i; + + for (i = 0; i < texture->level_count; ++i) + { + if (!(ret = wined3d_texture_load_location(texture, sub_resource_idx + i, context, resource->map_binding))) + break; + } + } + else + { + ret = wined3d_texture_load_location(texture, sub_resource_idx, context, resource->map_binding); + } }

if (!ret) @@ -3748,7 +3761,19 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour wined3d_texture_dirty_region_add(texture, sub_resource_idx / texture->level_count, box);

if (flags & WINED3D_MAP_WRITE) - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); + { + if (!texture_level) + { + unsigned int i; + + for (i = 0; i < texture->level_count; ++i) + wined3d_texture_invalidate_location(texture, sub_resource_idx + i, ~resource->map_binding); + } + else + { + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); + } + }

wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, resource->map_binding); base_memory = wined3d_context_map_bo_address(context, &data, sub_resource->size, flags);

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1865

Marvin

12:47 a.m.

New subject: [PATCH v2 3/3] wined3d: Load and invalidate every mipmap level when mapping the top mipmap level.

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=127937

Your paranoid android.

=== w8 (32 bit report) ===

d3d8: visual.c:12191: Test failed: pool 0x3: level 0: Got unexpected color 0x00000000. visual.c:12191: Test failed: pool 0x3: level 1: Got unexpected color 0x00000000. visual.c:12191: Test failed: pool 0x3: level 2: Got unexpected color 0x00000000. visual.c:12191: Test failed: pool 0x3: level 3: Got unexpected color 0x00000000. visual.c:12191: Test failed: pool 0x3: level 4: Got unexpected color 0x00000000. visual.c:12191: Test failed: pool 0x3: level 5: Got unexpected color 0x00000000.

=== w8adm (32 bit report) ===

=== w864 (32 bit report) ===

=== w1064v1507 (32 bit report) ===

=== w1064v1809 (32 bit report) ===

=== w1064_tsign (32 bit report) ===

=== w10pro64 (32 bit report) ===

=== w8 (32 bit report) ===

d3d9: visual.c:27941: Test failed: pool 0x3: level 0: Got unexpected color 0x00000000. visual.c:27941: Test failed: pool 0x3: level 1: Got unexpected color 0x00000000. visual.c:27941: Test failed: pool 0x3: level 2: Got unexpected color 0x00000000. visual.c:27941: Test failed: pool 0x3: level 3: Got unexpected color 0x00000000. visual.c:27941: Test failed: pool 0x3: level 4: Got unexpected color 0x00000000. visual.c:27941: Test failed: pool 0x3: level 5: Got unexpected color 0x00000000.

=== w8adm (32 bit report) ===

=== w864 (32 bit report) ===

=== w1064v1507 (32 bit report) ===

=== w1064v1809 (32 bit report) ===

=== w1064_tsign (32 bit report) ===

=== w10pro64 (32 bit report) ===

=== w864 (64 bit report) ===

=== w1064v1507 (64 bit report) ===

=== w1064v1809 (64 bit report) ===

=== w1064_2qxl (64 bit report) ===

=== w1064_adm (64 bit report) ===

=== w1064_tsign (64 bit report) ===

=== w10pro64 (64 bit report) ===

=== w10pro64_en_AE_u8 (64 bit report) ===

=== w10pro64_ar (64 bit report) ===

=== w10pro64_ja (64 bit report) ===

=== w10pro64_zh_CN (64 bit report) ===

780

Age (days ago)

780

Last active (days ago)

wine-gitlab@winehq.org

4 comments

3 participants

tags (0)

participants (3)

Marvin
Zebediah Figura
Zebediah Figura (＠zfigura)