April 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplay: Rework session event handler.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 71d532249bb8d3cbccd70152b869851dd5c342bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d532249bb8d3cbccd70152… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:30 2021 +0300 mfplay: Rework session event handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 181 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 137 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71d532249bb8d3cbccd7…

1 0

Nikolay Sivov : mfplay: Handle shutdown state in CreateMediaItemFromURL().
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 58d0cb0de0a21089d578045d65be15c9aa1ae6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d0cb0de0a21089d578045d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:31 2021 +0300 mfplay: Handle shutdown state in CreateMediaItemFromURL(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 27 +++++++++++++++++----- dlls/mfplay/tests/mfplay.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 146c50fc755..a45c5ac9ffa 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -806,18 +806,17 @@ static HRESULT WINAPI media_player_GetState(IMFPMediaPlayer *iface, MFP_MEDIAPLA return S_OK; } -static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface, +static HRESULT media_player_create_item_from_url(struct media_player *player, const WCHAR *url, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **ret) { - struct media_player *player = impl_from_IMFPMediaPlayer(iface); struct media_item *item; MF_OBJECT_TYPE obj_type; IUnknown *object; HRESULT hr; - TRACE("%p, %s, %d, %lx, %p.\n", iface, debugstr_w(url), sync, user_data, ret); + *ret = NULL; - if (FAILED(hr = create_media_item(iface, user_data, &item))) + if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) return hr; if (url && !(item->url = wcsdup(url))) @@ -828,8 +827,6 @@ static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface if (sync) { - *ret = NULL; - if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, player->propstore, &obj_type, &object))) { @@ -853,6 +850,24 @@ static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface return hr; } +static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface, + const WCHAR *url, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **ret) +{ + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + HRESULT hr; + + TRACE("%p, %s, %d, %lx, %p.\n", iface, debugstr_w(url), sync, user_data, ret); + + EnterCriticalSection(&player->cs); + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else + hr = media_player_create_item_from_url(player, url, sync, user_data, ret); + LeaveCriticalSection(&player->cs); + + return hr; +} + static HRESULT WINAPI media_player_CreateMediaItemFromObject(IMFPMediaPlayer *iface, IUnknown *object, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **item) { diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 6d82f630075..c9a07ca9d81 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "mfplay.h" +#include "mferror.h" #include "wine/test.h" @@ -119,7 +120,63 @@ static void test_create_player(void) IMFPMediaPlayer_Release(player); } +static void test_shutdown(void) +{ + IMFPMediaPlayer *player; + float slowest, fastest; + HRESULT hr; + MFP_MEDIAPLAYER_STATE state; + IMFPMediaItem *item; + HWND window; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetState(player, &state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(state == MFP_MEDIAPLAYER_STATE_EMPTY, "Unexpected state %d.\n", state); + + hr = IMFPMediaPlayer_Shutdown(player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Check methods in shutdown state. */ + hr = IMFPMediaPlayer_Play(player); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_Pause(player); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_Stop(player); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetSupportedRates(player, TRUE, &slowest, &fastest); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetState(player, &state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(state == MFP_MEDIAPLAYER_STATE_SHUTDOWN, "Unexpected state %d.\n", state); + + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_ClearMediaItem(player); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetMediaItem(player, &item); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoWindow(player, &window); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_Shutdown(player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); + test_shutdown(); }

1 0

Nikolay Sivov : mfplay: Handle shutdown state on GetMediaItem().
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: e2f74ce448d5e8118c7353c1a593414fc9be61af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f74ce448d5e8118c7353c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:32 2021 +0300 mfplay: Handle shutdown state on GetMediaItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 4 +++- dlls/mfplay/tests/mfplay.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index a45c5ac9ffa..e061e21acb8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -998,7 +998,9 @@ static HRESULT WINAPI media_player_GetMediaItem(IMFPMediaPlayer *iface, IMFPMedi return E_POINTER; EnterCriticalSection(&player->cs); - if (!player->item) + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else if (!player->item) hr = MF_E_NOT_FOUND; else { diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index c9a07ca9d81..64a48cceaca 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -163,7 +163,6 @@ static void test_shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_GetMediaItem(player, &item); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_GetVideoWindow(player, &window);

1 0

Nikolay Sivov : mfplay: Fix a leak on error path in synchronous CreateMediaItemFromURL() (Coverity).
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 5512eceada778e8502af65408c4fbdfd4755e3fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5512eceada778e8502af6540… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:33 2021 +0300 mfplay: Fix a leak on error path in synchronous CreateMediaItemFromURL() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index e061e21acb8..a95e1d3ca36 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -835,7 +835,12 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } if (SUCCEEDED(hr)) + { *ret = &item->IMFPMediaItem_iface; + IMFPMediaItem_AddRef(*ret); + } + + IMFPMediaItem_Release(&item->IMFPMediaItem_iface); return hr; }

1 0

Nikolay Sivov : mfplay: Implement MFP_EVENT_TYPE_MF event.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: d0257e0b72c66a4ee5e99ec6af5d8dafb8c76395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0257e0b72c66a4ee5e99ec6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:34 2021 +0300 mfplay: Implement MFP_EVENT_TYPE_MF event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index a95e1d3ca36..b098d880461 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1488,6 +1488,21 @@ static void media_player_clear_item(struct media_player *player, HRESULT event_s LeaveCriticalSection(&player->cs); } +static void media_player_create_forward_event(struct media_player *player, HRESULT event_status, IMFMediaEvent *session_event, + struct media_event **event) +{ + EnterCriticalSection(&player->cs); + + if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_MF, event_status, player->item, event))) + { + IMFMediaEvent_GetType(session_event, &(*event)->u.event.MFEventType); + (*event)->u.event.pMFMediaEvent = session_event; + IMFMediaEvent_AddRef((*event)->u.event.pMFMediaEvent); + } + + LeaveCriticalSection(&player->cs); +} + static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1543,6 +1558,19 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba } break; + + case MEBufferingStarted: + case MEBufferingStopped: + case MEExtendedType: + case MEReconnectStart: + case MEReconnectEnd: + case MERendererEvent: + case MEStreamSinkFormatChanged: + + media_player_create_forward_event(player, event_status, session_event, &event); + + break; + default: ; }

1 0

Nikolay Sivov : d2d1: Remove unnecessary return statements.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 0aa6a78f7d3cabeda9e933903dbcc5cd6c6eb460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa6a78f7d3cabeda9e93390… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:23:05 2021 +0300 d2d1: Remove unnecessary return statements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index b65727d3a32..5f081a1c12d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -639,7 +639,7 @@ static void STDMETHODCALLTYPE d2d_factory_mt_Enter(ID2D1Multithread *iface) TRACE("%p.\n", iface); - return EnterCriticalSection(&factory->cs); + EnterCriticalSection(&factory->cs); } static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) @@ -648,7 +648,7 @@ static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) TRACE("%p.\n", iface); - return LeaveCriticalSection(&factory->cs); + LeaveCriticalSection(&factory->cs); } static BOOL STDMETHODCALLTYPE d2d_factory_st_GetMultithreadProtected(ID2D1Multithread *iface)

1 0

Andrew Sheldon : wined3d: Add GPU information for Radeon RX 6800(XT) / 6900 XT.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: d1b2eea4218dfb5d08ce2732eb6df9a283f00e0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b2eea4218dfb5d08ce2732… Author: Andrew Sheldon <asheldon55(a)gmail.com> Date: Tue Apr 13 12:58:40 2021 +1000 wined3d: Add GPU information for Radeon RX 6800(XT) / 6900 XT. Signed-off-by: Andrew Sheldon <asheldon55(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7287b333f97..0a3c547e7a9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -514,6 +514,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34ec814685c..af7237ae4f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,6 +2903,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, + CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Zebediah Figura : wined3d: Map resources through wined3d_device_context_ops.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 2fd3ec79cd9b621e6e6995aceabc93ce9f8c8bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd3ec79cd9b621e6e6995ac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 12 22:46:29 2021 -0500 wined3d: Map resources through wined3d_device_context_ops. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 22 +++++++++++++++------- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/wined3d_private.h | 9 +++++---- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 32ea900e27d..bb11851c1be 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2279,9 +2279,11 @@ static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) op->sub_resource_idx, op->map_desc, op->box, op->flags); } -HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) +static HRESULT wined3d_cs_map(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, + unsigned int flags) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_map *op; HRESULT hr; @@ -2289,7 +2291,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, * increasing the map count would be visible to applications. */ wined3d_not_from_cs(cs); - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2298,7 +2300,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, op->flags = flags; op->hr = &hr; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2312,20 +2314,22 @@ static void wined3d_cs_exec_unmap(struct wined3d_cs *cs, const void *data) *op->hr = resource->resource_ops->resource_sub_resource_unmap(resource, op->sub_resource_idx); } -HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx) +static HRESULT wined3d_cs_unmap(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_unmap *op; HRESULT hr; wined3d_not_from_cs(cs); - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UNMAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; op->hr = &hr; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2790,6 +2794,8 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_st_submit, wined3d_cs_st_finish, wined3d_cs_st_push_constants, + wined3d_cs_map, + wined3d_cs_unmap, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -2911,6 +2917,8 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_submit, wined3d_cs_mt_finish, wined3d_cs_mt_push_constants, + wined3d_cs_map, + wined3d_cs_unmap, }; static void poll_queries(struct wined3d_cs *cs) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8f2dc9ad095..6c937fa79b2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -376,14 +376,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i flags = wined3d_resource_sanitise_map_flags(resource, flags); wined3d_resource_wait_idle(resource); - return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags); + return resource->device->cs->c.ops->map(&resource->device->cs->c, resource, sub_resource_idx, map_desc, box, flags); } HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); - return wined3d_cs_unmap(resource->device->cs, resource, sub_resource_idx); + return resource->device->cs->c.ops->unmap(&resource->device->cs->c, resource, sub_resource_idx); } void CDECL wined3d_resource_preload(struct wined3d_resource *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af7237ae4f4..4d5f4765f57 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4687,6 +4687,11 @@ struct wined3d_device_context_ops void (*finish)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); void (*push_constants)(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants); + HRESULT (*map)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, + unsigned int flags); + HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx); }; struct wined3d_device_context @@ -4756,10 +4761,6 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; -HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; -HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, - unsigned int sub_resource_idx) DECLSPEC_HIDDEN; static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) {

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_map().
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: cfd25180ba4df9f2b11d14d4f60c12e82010d01d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfd25180ba4df9f2b11d14d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 12 22:46:30 2021 -0500 wined3d: Introduce wined3d_device_context_map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/resource.c | 58 +---------------------------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 4 files changed, 71 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1f7568842e..67b1de831e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5250,6 +5250,72 @@ void CDECL wined3d_device_context_clear_uav_uint(struct wined3d_device_context * wined3d_device_context_emit_clear_uav_uint(context, view, clear_value); } +static unsigned int sanitise_map_flags(const struct wined3d_resource *resource, unsigned int flags) +{ + /* Not all flags make sense together, but Windows never returns an error. + * Catch the cases that could cause issues. */ + if (flags & WINED3D_MAP_READ) + { + if (flags & WINED3D_MAP_DISCARD) + { + WARN("WINED3D_MAP_READ combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); + return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); + } + if (flags & WINED3D_MAP_NOOVERWRITE) + { + WARN("WINED3D_MAP_READ combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); + return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); + } + } + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); + } + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_NOOVERWRITE used with WINED3D_MAP_DISCARD, ignoring WINED3D_MAP_DISCARD.\n"); + flags &= ~WINED3D_MAP_DISCARD; + } + } + + return flags; +} + +HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) +{ + TRACE("context %p, resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", + context, resource, sub_resource_idx, map_desc, debug_box(box), flags); + + if (!(flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE))) + { + WARN("No read/write flags specified.\n"); + return E_INVALIDARG; + } + + if ((flags & WINED3D_MAP_READ) && !(resource->access & WINED3D_RESOURCE_ACCESS_MAP_R)) + { + WARN("Resource does not have MAP_R access.\n"); + return E_INVALIDARG; + } + + if ((flags & WINED3D_MAP_WRITE) && !(resource->access & WINED3D_RESOURCE_ACCESS_MAP_W)) + { + WARN("Resource does not have MAP_W access.\n"); + return E_INVALIDARG; + } + + flags = sanitise_map_flags(resource, flags); + wined3d_resource_wait_idle(resource); + + return context->ops->map(context, resource, sub_resource_idx, map_desc, box, flags); +} + struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6c937fa79b2..8085c0e6aee 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -314,69 +314,13 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st desc->size = resource->size; } -static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource *resource, DWORD flags) -{ - /* Not all flags make sense together, but Windows never returns an error. - * Catch the cases that could cause issues. */ - if (flags & WINED3D_MAP_READ) - { - if (flags & WINED3D_MAP_DISCARD) - { - WARN("WINED3D_MAP_READ combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); - return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); - } - if (flags & WINED3D_MAP_NOOVERWRITE) - { - WARN("WINED3D_MAP_READ combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); - return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); - } - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - { - if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); - } - if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - { - WARN("WINED3D_MAP_NOOVERWRITE used with WINED3D_MAP_DISCARD, ignoring WINED3D_MAP_DISCARD.\n"); - flags &= ~WINED3D_MAP_DISCARD; - } - } - - return flags; -} - HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); - if (!(flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE))) - { - WARN("No read/write flags specified.\n"); - return E_INVALIDARG; - } - - if ((flags & WINED3D_MAP_READ) && !(resource->access & WINED3D_RESOURCE_ACCESS_MAP_R)) - { - WARN("Resource does not have MAP_R access.\n"); - return E_INVALIDARG; - } - - if ((flags & WINED3D_MAP_WRITE) && !(resource->access & WINED3D_RESOURCE_ACCESS_MAP_W)) - { - WARN("Resource does not have MAP_W access.\n"); - return E_INVALIDARG; - } - - flags = wined3d_resource_sanitise_map_flags(resource, flags); - wined3d_resource_wait_idle(resource); - - return resource->device->cs->c.ops->map(&resource->device->cs->c, resource, sub_resource_idx, map_desc, box, flags); + return wined3d_device_context_map(&resource->device->cs->c, resource, sub_resource_idx, map_desc, box, flags); } HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cff4fd86b1a..874b0a9dfc7 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c6c97da4fbe..a0c5a876ad7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2566,6 +2566,9 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context struct wined3d_buffer *buffer, unsigned int offset, bool indexed); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags); void __cdecl wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, enum wined3d_format_id format_id);

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_map().
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: d6606efbaa95f379e79071712bc74c1e5450c8a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6606efbaa95f379e7907171… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 12 22:46:31 2021 -0500 d3d11: Use wined3d_device_context_map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9845f93eebf..6944c479e60 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -603,6 +603,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext1 static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext1 *iface, ID3D11Resource *resource, UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_resource; struct wined3d_map_desc map_desc; HRESULT hr; @@ -616,7 +617,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); - hr = wined3d_resource_map(wined3d_resource, subresource_idx, + hr = wined3d_device_context_map(context->wined3d_context, wined3d_resource, subresource_idx, &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); wined3d_mutex_unlock();

1 0