January 2023 - Wine-Commits

Jinoh Kang : regedit: Use the default WM_PAINT implementation for REGEDIT window.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 8242b651722c41564f165967a96978f2db36f4c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/8242b651722c41564f165967a96978… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Dec 22 01:45:31 2022 +0900 regedit: Use the default WM_PAINT implementation for REGEDIT window. --- programs/regedit/childwnd.c | 14 -------------- programs/regedit/main.c | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index c243a76c807..3f1797d31a0 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -79,17 +79,6 @@ static void ResizeWnd(int cx, int cy) EndDeferWindowPos(hdwp); } -static void OnPaint(HWND hWnd) -{ - PAINTSTRUCT ps; - RECT rt; - - GetClientRect(hWnd, &rt); - BeginPaint(hWnd, &ps); - FillRect(ps.hdc, &rt, GetSysColorBrush(COLOR_BTNFACE)); - EndPaint(hWnd, &ps); -} - static LPWSTR CombinePaths(LPCWSTR pPaths[], int nPaths) { int i, len, pos; LPWSTR combined; @@ -455,9 +444,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa goto def; } break; - case WM_PAINT: - OnPaint(hWnd); - return 0; case WM_SETCURSOR: if (LOWORD(lParam) == HTCLIENT) { POINT pt; diff --git a/programs/regedit/main.c b/programs/regedit/main.c index b1035629726..4cc00d730a7 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -75,6 +75,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) wndclass.lpfnWndProc = ChildWndProc; wndclass.cbWndExtra = sizeof(HANDLE); wndclass.lpszClassName = szChildClass; + wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); RegisterClassExW(&wndclass); hMenuFrame = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_REGEDIT_MENU));

1 0

Jinoh Kang : regedit: Clip siblings when drawing list and tree views.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 36ca172e85bf518faab581cc9b849fc79cfe6819 URL: https://gitlab.winehq.org/wine/wine/-/commit/36ca172e85bf518faab581cc9b849f… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Dec 22 01:50:38 2022 +0900 regedit: Clip siblings when drawing list and tree views. --- programs/regedit/listview.c | 3 ++- programs/regedit/treeview.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 159efc0218f..c7a301929c2 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -361,7 +361,8 @@ HWND CreateListView(HWND hwndParent, UINT id) /* Get the dimensions of the parent window's client area, and create the list view control. */ GetClientRect(hwndParent, &rcClient); hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, L"List View", - WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | + LVS_REPORT | LVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, ULongToHandle(id), hInst, NULL); if (!hwndLV) return NULL; diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index cd80449999a..e0cac006090 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -696,7 +696,8 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, L"Tree View", - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | + WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | + TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, ULongToHandle(id), hInst, NULL);

1 0

Zebediah Figura : wined3d: Ignore DISCARD and NOOVERWRITE on buffers which are not GPU-accessible.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 734190a78c132c384ff2593a45884dfc40baae44 URL: https://gitlab.winehq.org/wine/wine/-/commit/734190a78c132c384ff2593a45884d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 19 15:41:39 2022 -0600 wined3d: Ignore DISCARD and NOOVERWRITE on buffers which are not GPU-accessible. This fixes a regression introduced by ebbcc10b0593948657b8e684c3a9be8ace1a5d25. Prior to that commit, buffers which were not CPU-accessible would not have the WINED3D_BUFFER_USE_BO flag set, and accordingly buffer_resource_sub_resource_map() would simply return the SYSMEM location, ignoring the DISCARD and NOOVERWRITE flags. However, the "accelerated" path in wined3d_cs_map_upload_bo() only checks for the DISCARD flag, assuming that it is only set for dynamic GPU-accessible buffers, and would subsequently try to allocate non-mappable memory and then map it. This commit avoids the accelerated path for such buffers, once again matching our old behaviour. According to [1], this also matches Windows: DISCARD on SYSTEMMEM buffers is ignored on both AMD and NVidia, and NOOVERWRITE is ignored on NVidia (but not AMD). [1] https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/mes… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53863 --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c0646148c4a..b294af3c5fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5167,9 +5167,9 @@ static unsigned int sanitise_map_flags(const struct wined3d_resource *resource, } else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { - if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + if (!(resource->access & WINED3D_RESOURCE_ACCESS_GPU) || !(resource->usage & WINED3DUSAGE_DYNAMIC)) { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + WARN("DISCARD or NOOVERWRITE map not on dynamic GPU-accessible buffer, ignoring.\n"); return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); } if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))

1 0

Zebediah Figura : wined3d: Load and invalidate every mipmap level when mapping the top mipmap level.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: d9c369c7476c8681fc78cd0a38fb97e80036edaa URL: https://gitlab.winehq.org/wine/wine/-/commit/d9c369c7476c8681fc78cd0a38fb97… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 17:47:54 2022 -0600 wined3d: Load and invalidate every mipmap level when mapping the top mipmap level. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53743 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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 c8822b4c0ca..5c2b71fc8c5 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -12187,7 +12187,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 dfbfc705598..230f7deabb2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27983,7 +27983,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);

1 0

Zebediah Figura : d3d9/tests: Test uploading the whole mipmap chain in one map.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 2954d3e4a23025657740fb178ddbe110890c0cc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2954d3e4a23025657740fb178ddbe1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 17:43:39 2022 -0600 d3d9/tests: Test uploading the whole mipmap chain in one map. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8857c483302..dfbfc705598 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -287,6 +287,7 @@ static D3DCOLOR check_expected_rt_color(unsigned int line, IDirect3DSurface9 *rt #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 = check_expected_rt_color(line, rt, expected_color); @@ -27922,6 +27923,78 @@ static void test_managed_generate_mipmap(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, + }; + + 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; @@ -28075,4 +28148,5 @@ START_TEST(visual) test_filling_convention(); test_managed_reset(); test_managed_generate_mipmap(); + test_mipmap_upload(); }

1 0

Zebediah Figura : d3d8/tests: Test uploading the whole mipmap chain in one map.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 798b23d9711e767da00157cc89c87e3011084ad5 URL: https://gitlab.winehq.org/wine/wine/-/commit/798b23d9711e767da00157cc89c87e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 17:43:48 2022 -0600 d3d8/tests: Test uploading the whole mipmap chain in one map. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ea2d96378f7..c8822b4c0ca 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,78 @@ 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, + }; + + 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 +12281,5 @@ START_TEST(visual) test_dynamic_map_synchronization(); test_filling_convention(); test_managed_reset(); + test_mipmap_upload(); }

1 0

Zebediah Figura : d3d11/tests: Do not test deferred contexts in test_dynamic_map_synchronization().
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: e7c46ac6b567af4a563c4d3af93dd6a4feb1d724 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7c46ac6b567af4a563c4d3af93dd6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 16:15:39 2022 -0600 d3d11/tests: Do not test deferred contexts in test_dynamic_map_synchronization(). DISCARD maps on deferred contexts do not seem to offer the same synchronization guarantees as do DISCARD maps on the immediate context, at least not with respect to subsequent NOOVERWRITE maps on the immediate context. This is not particularly surprising, seeing as it is probably far more usual to only map a resource on one kind of context or the other. The test currently fails on Windows 11 on NVidia drivers, but it also fails on Mesa, for what I think are the same reasons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52563 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54023 --- dlls/d3d11/tests/d3d11.c | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 336f4b0ab7d..1f6b211f693 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34355,11 +34355,10 @@ static void test_dynamic_map_synchronization(void) { static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; - ID3D11DeviceContext *immediate, *deferred; struct d3d11_test_context test_context; D3D11_BUFFER_DESC buffer_desc = {0}; D3D11_MAPPED_SUBRESOURCE map_desc; - ID3D11CommandList *list; + ID3D11DeviceContext *immediate; ID3D11Device *device; unsigned int x, y; HRESULT hr; @@ -34369,9 +34368,6 @@ static void test_dynamic_map_synchronization(void) device = test_context.device; immediate = test_context.immediate_context; - hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - buffer_desc.ByteWidth = 200 * 4 * sizeof(struct vec3); buffer_desc.Usage = D3D11_USAGE_DYNAMIC; buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; @@ -34383,33 +34379,14 @@ static void test_dynamic_map_synchronization(void) for (y = 0; y < 200; ++y) { - if (y % 2) - { - hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, - 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - - fill_dynamic_vb_quad(&map_desc, 0, y); - - ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); - draw_color_quad(&test_context, &green); - } - else - { - hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)test_context.vb, - 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - - fill_dynamic_vb_quad(&map_desc, 0, y); + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)test_context.vb, 0); + fill_dynamic_vb_quad(&map_desc, 0, y); - hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID3D11DeviceContext_ExecuteCommandList(immediate, list, TRUE); - ID3D11CommandList_Release(list); - draw_color_quad(&test_context, &green); - } + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); + draw_color_quad(&test_context, &green); for (x = 1; x < 200; ++x) { @@ -34426,7 +34403,6 @@ static void test_dynamic_map_synchronization(void) check_texture_color(test_context.backbuffer, 0xff00ff00, 0); - ID3D11DeviceContext_Release(deferred); release_test_context(&test_context); }

1 0