May 2020 - Wine-commits - list.winehq.org

Jactry Zeng : qcap/tests: Correct CLSID in aggregation tests of smart tee filter.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: fceb73009858e6e25cc9bdb1b6096d7bd43d1c7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fceb73009858e6e25cc9bdb1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed May 13 19:30:05 2020 +0800 qcap/tests: Correct CLSID in aggregation tests of smart tee filter. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 134b8ed964..2f8fa6c4b5 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -185,12 +185,12 @@ static void test_aggregation(void) ULONG ref; filter = (IBaseFilter *)0xdeadbeef; - hr = CoCreateInstance(&CLSID_AviDest, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_SmartTee, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!filter, "Got interface %p.\n", filter); - hr = CoCreateInstance(&CLSID_AviDest, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_SmartTee, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref);

1 0

Nikolay Sivov : mf: Add flags field for additional SAR state.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 333e3a53d5450fcbb36b3b2ef2a359eeab3b81d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=333e3a53d5450fcbb36b3b2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 16:42:06 2020 +0300 mf: Add flags field for additional SAR state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index f883163bde..d5dc0b4f38 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -38,6 +38,11 @@ enum stream_state STREAM_STATE_PAUSED, }; +enum audio_renderer_flags +{ + SAR_SHUT_DOWN = 0x1, +}; + struct audio_renderer { IMFMediaSink IMFMediaSink_iface; @@ -62,7 +67,7 @@ struct audio_renderer ISimpleAudioVolume *audio_volume; HANDLE buffer_ready_event; enum stream_state state; - BOOL is_shut_down; + unsigned int flags; CRITICAL_SECTION cs; }; @@ -212,7 +217,7 @@ static HRESULT WINAPI audio_renderer_sink_GetCharacteristics(IMFMediaSink *iface TRACE("%p, %p.\n", iface, flags); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; *flags = MEDIASINK_FIXED_STREAMS | MEDIASINK_CAN_PREROLL; @@ -227,7 +232,7 @@ static HRESULT WINAPI audio_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWO TRACE("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); - return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; + return renderer->flags & SAR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, DWORD stream_sink_id) @@ -236,7 +241,7 @@ static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, TRACE("%p, %#x.\n", iface, stream_sink_id); - return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; + return renderer->flags & SAR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface, DWORD *count) @@ -248,7 +253,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface if (!count) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; *count = 1; @@ -264,12 +269,9 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *ifa TRACE("%p, %u, %p.\n", iface, index, stream); - if (renderer->is_shut_down) - return MF_E_SHUTDOWN; - EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (index > 0) hr = MF_E_INVALIDINDEX; @@ -294,7 +296,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (stream_sink_id > 0) hr = MF_E_INVALIDSTREAMNUMBER; @@ -333,7 +335,7 @@ static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else audio_renderer_set_presentation_clock(renderer, clock); @@ -355,7 +357,7 @@ static HRESULT WINAPI audio_renderer_sink_GetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (renderer->clock) { @@ -376,11 +378,11 @@ static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) TRACE("%p.\n", iface); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; EnterCriticalSection(&renderer->cs); - renderer->is_shut_down = TRUE; + renderer->flags |= SAR_SHUT_DOWN; IMFMediaEventQueue_Shutdown(renderer->event_queue); IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); audio_renderer_set_presentation_clock(renderer, NULL); @@ -437,7 +439,7 @@ static HRESULT WINAPI audio_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll * TRACE("%p, %s.\n", iface, debugstr_time(start_time)); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; audio_renderer_preroll(renderer); @@ -1145,7 +1147,7 @@ static HRESULT WINAPI audio_renderer_stream_GetEvent(IMFStreamSink *iface, DWORD TRACE("%p, %#x, %p.\n", iface, flags, event); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_GetEvent(renderer->stream_event_queue, flags, event); @@ -1158,7 +1160,7 @@ static HRESULT WINAPI audio_renderer_stream_BeginGetEvent(IMFStreamSink *iface, TRACE("%p, %p, %p.\n", iface, callback, state); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_BeginGetEvent(renderer->stream_event_queue, callback, state); @@ -1171,7 +1173,7 @@ static HRESULT WINAPI audio_renderer_stream_EndGetEvent(IMFStreamSink *iface, IM TRACE("%p, %p, %p.\n", iface, result, event); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_EndGetEvent(renderer->stream_event_queue, result, event); @@ -1184,7 +1186,7 @@ static HRESULT WINAPI audio_renderer_stream_QueueEvent(IMFStreamSink *iface, Med TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, event_type, ext_type, hr, value); @@ -1196,7 +1198,7 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaSink(IMFStreamSink *iface, I TRACE("%p, %p.\n", iface, sink); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *sink = &renderer->IMFMediaSink_iface; @@ -1211,7 +1213,7 @@ static HRESULT WINAPI audio_renderer_stream_GetIdentifier(IMFStreamSink *iface, TRACE("%p, %p.\n", iface, identifier); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *identifier = 0; @@ -1228,7 +1230,7 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *i if (!handler) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *handler = &renderer->IMFMediaTypeHandler_iface; @@ -1462,7 +1464,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMajorType(IMFMediaTy if (!type) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; memcpy(type, &MFMediaType_Audio, sizeof(*type));

1 0

Nikolay Sivov : mf: Avoid unnecessary prerolling calls in SAR.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: bd1bfd2c8aaa270e86948a3bec0566382c09f0c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd1bfd2c8aaa270e86948a3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 16:42:07 2020 +0300 mf: Avoid unnecessary prerolling calls in SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index d5dc0b4f38..66fdf471ad 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -41,6 +41,7 @@ enum stream_state enum audio_renderer_flags { SAR_SHUT_DOWN = 0x1, + SAR_PREROLLED = 0x2, }; struct audio_renderer @@ -179,6 +180,7 @@ static void audio_renderer_release_audio_client(struct audio_renderer *renderer) if (renderer->audio_volume) ISimpleAudioVolume_Release(renderer->audio_volume); renderer->audio_volume = NULL; + renderer->flags &= ~SAR_PREROLLED; } static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) @@ -409,10 +411,14 @@ static const IMFMediaSinkVtbl audio_renderer_sink_vtbl = static void audio_renderer_preroll(struct audio_renderer *renderer) { - int i; + unsigned int i; + + if (renderer->flags & SAR_PREROLLED) + return; for (i = 0; i < 2; ++i) IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + renderer->flags |= SAR_PREROLLED; } static HRESULT WINAPI audio_renderer_preroll_QueryInterface(IMFMediaSinkPreroll *iface, REFIID riid, void **obj) @@ -586,6 +592,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStop(IMFClockStateSink *i else WARN("Failed to stop audio client, hr %#x.\n", hr); renderer->state = STREAM_STATE_STOPPED; + renderer->flags &= ~SAR_PREROLLED; } } else

1 0

Nikolay Sivov : mf: Preroll on sink start.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: cbf156b780d60e664300bcd0ad51f5aeb4afdd3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf156b780d60e664300bcd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 16:42:08 2020 +0300 mf: Preroll on sink start. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 66fdf471ad..5f035a801c 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -567,6 +567,8 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStart(IMFClockStateSink * hr = MF_E_NOT_INITIALIZED; IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkStarted, &GUID_NULL, hr, NULL); + if (SUCCEEDED(hr)) + audio_renderer_preroll(renderer); LeaveCriticalSection(&renderer->cs); return hr;

1 0

Nikolay Sivov : mf/sar: Implement sample processing.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 3d51816d1cdf3e8aae1df0417ecf350c6237bc82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d51816d1cdf3e8aae1df041… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 16:42:09 2020 +0300 mf/sar: Implement sample processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- include/mfapi.h | 1 + 2 files changed, 271 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d51816d1cdf3e8aae1d…

1 0

Nikolay Sivov : mf/sar: Implement stream flushing.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 3000b6ea1a398ffddf842e49e35f4deaeb157e92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3000b6ea1a398ffddf842e49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 16:42:10 2020 +0300 mf/sar: Implement stream flushing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 59ee9c3dc4..0ea46dcb89 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1396,9 +1396,30 @@ static HRESULT WINAPI audio_renderer_stream_PlaceMarker(IMFStreamSink *iface, MF static HRESULT WINAPI audio_renderer_stream_Flush(IMFStreamSink *iface) { - FIXME("%p.\n", iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); + struct queued_object *obj, *obj2; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&renderer->cs); + if (renderer->flags & SAR_SHUT_DOWN) + hr = MF_E_STREAMSINK_REMOVED; + else + { + LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) + { + if (obj->type == OBJECT_TYPE_MARKER) + { + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkMarker, + &GUID_NULL, S_OK, &obj->u.marker.context); + } + release_pending_object(obj); + } + } + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMFStreamSinkVtbl audio_renderer_stream_vtbl =

1 0

Henri Verbeet : wined3d: Implement Vulkan image shader resource view descriptors.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: bd63ec2f63cddedc1c4aa267b58e5e49dc8f65f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd63ec2f63cddedc1c4aa267… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 19:34:49 2020 +0430 wined3d: Implement Vulkan image shader resource view descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 45 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 +++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4c12cff7d1..4098ee6cc4 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1330,8 +1330,13 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; const VkDescriptorBufferInfo *buffer_info; + struct wined3d_shader_resource_view *srv; + const VkDescriptorImageInfo *image_info; + struct wined3d_resource *resource; VkDescriptorSet vk_descriptor_set; + struct wined3d_view_vk *view_vk; struct wined3d_buffer *buffer; + VkDescriptorType type; VkResult vr; size_t i; @@ -1362,6 +1367,36 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: + if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) + { + FIXME("NULL shader resource views not implemented.\n"); + return false; + } + resource = srv->resource; + + view_vk = &wined3d_shader_resource_view_vk(srv)->view_vk; + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer SRV descriptors not implemented.\n"); + return false; + } + else + { + struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (view_vk->u.vk_image_info.imageView) + image_info = &view_vk->u.vk_image_info; + else + image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); + type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; + } + + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, type, NULL, image_info, NULL)) + return false; + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); return false; @@ -1465,6 +1500,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; const struct wined3d_shader_resource_binding *binding; + struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; size_t i; @@ -1487,6 +1523,15 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: + if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) + break; + + if (srv->resource->type != WINED3D_RTYPE_BUFFER) + wined3d_texture_load(texture_from_resource(srv->resource), &context_vk->c, FALSE); + wined3d_context_vk_reference_shader_resource_view(context_vk, wined3d_shader_resource_view_vk(srv)); + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 321d58b0bf..8b7fd1205f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5671,6 +5671,18 @@ static inline void wined3d_context_vk_reference_rendertarget_view(const struct w rtv_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk, + struct wined3d_shader_resource_view_vk *srv_vk) +{ + struct wined3d_resource *resource = srv_vk->v.resource; + + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; +} + static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) {

1 0

Henri Verbeet : wined3d: Implement Vulkan buffer shader resource view descriptors.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 35b27b4aec7a27030c142d1497495f7412acdcc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35b27b4aec7a27030c142d14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 19:34:50 2020 +0430 wined3d: Implement Vulkan buffer shader resource view descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/context_vk.c | 26 +++++++++++++++++++++----- dlls/wined3d/view.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +++ 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f3404c5e65..8758627cb1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1383,6 +1383,7 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour vk_buffer_view = &view_vk->u.vk_buffer_view; else vk_image_view = &view_vk->u.vk_image_info.imageView; + list_remove(&view_vk->bo_user.entry); wined3d_shader_resource_view_cleanup(&srv_vk->v); wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, NULL, NULL, &view_vk->command_buffer_id, srv_vk); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4098ee6cc4..4e4e064250 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1336,6 +1336,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkDescriptorSet vk_descriptor_set; struct wined3d_view_vk *view_vk; struct wined3d_buffer *buffer; + VkBufferView *buffer_view; VkDescriptorType type; VkResult vr; size_t i; @@ -1378,8 +1379,9 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con view_vk = &wined3d_shader_resource_view_vk(srv)->view_vk; if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer SRV descriptors not implemented.\n"); - return false; + image_info = NULL; + buffer_view = &view_vk->u.vk_buffer_view; + type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; } else { @@ -1389,11 +1391,12 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con image_info = &view_vk->u.vk_image_info; else image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); + buffer_view = NULL; type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; } if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, - binding->binding_idx, type, NULL, image_info, NULL)) + binding->binding_idx, type, NULL, image_info, buffer_view)) return false; break; @@ -1500,6 +1503,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; const struct wined3d_shader_resource_binding *binding; + struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; @@ -1527,9 +1531,21 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) break; - if (srv->resource->type != WINED3D_RTYPE_BUFFER) + srv_vk = wined3d_shader_resource_view_vk(srv); + if (srv->resource->type == WINED3D_RTYPE_BUFFER) + { + if (!srv_vk->view_vk.bo_user.valid) + { + wined3d_shader_resource_view_vk_update(srv_vk, context_vk); + context_invalidate_compute_state(&context_vk->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + } + wined3d_buffer_load(buffer_from_resource(srv->resource), &context_vk->c, state); + } + else + { wined3d_texture_load(texture_from_resource(srv->resource), &context_vk->c, FALSE); - wined3d_context_vk_reference_shader_resource_view(context_vk, wined3d_shader_resource_view_vk(srv)); + } + wined3d_context_vk_reference_shader_resource_view(context_vk, srv_vk); break; case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e7f77f58cd..4a75c69657 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1011,12 +1011,32 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view return hr; } +void wined3d_shader_resource_view_vk_update(struct wined3d_shader_resource_view_vk *srv_vk, + struct wined3d_context_vk *context_vk) +{ + const struct wined3d_format_vk *view_format_vk = wined3d_format_vk(srv_vk->v.format); + const struct wined3d_view_desc *desc = &srv_vk->v.desc; + struct wined3d_resource *resource = srv_vk->v.resource; + struct wined3d_view_vk *view_vk = &srv_vk->view_vk; + struct wined3d_buffer_vk *buffer_vk; + VkBufferView vk_buffer_view; + + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) + { + view_vk->u.vk_buffer_view = vk_buffer_view; + view_vk->bo_user.valid = true; + } +} + static void wined3d_shader_resource_view_vk_cs_init(void *object) { struct wined3d_shader_resource_view_vk *srv_vk = object; struct wined3d_view_desc *desc = &srv_vk->v.desc; struct wined3d_texture_vk *texture_vk; const struct wined3d_format *format; + struct wined3d_buffer_vk *buffer_vk; struct wined3d_resource *resource; struct wined3d_context *context; VkBufferView vk_buffer_view; @@ -1028,9 +1048,11 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + context = context_acquire(resource->device, NULL, 0); vk_buffer_view = wined3d_view_vk_create_buffer_view(wined3d_context_vk(context), - desc, wined3d_buffer_vk(buffer_from_resource(resource)), wined3d_format_vk(format)); + desc, buffer_vk, wined3d_format_vk(format)); context_release(context); if (!vk_buffer_view) @@ -1039,6 +1061,8 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); srv_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + srv_vk->view_vk.bo_user.valid = true; + list_add_head(&buffer_vk->bo.users, &srv_vk->view_vk.bo_user.entry); return; } @@ -1087,6 +1111,7 @@ HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view if (FAILED(hr = wined3d_shader_resource_view_init(&view_vk->v, desc, resource, parent, parent_ops))) return hr; + list_init(&view_vk->view_vk.bo_user.entry); wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_vk_cs_init, view_vk); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b7fd1205f..35b0815d95 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4698,6 +4698,7 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view struct wined3d_view_vk { + struct wined3d_bo_user_vk bo_user; union { VkBufferView vk_buffer_view; @@ -4721,6 +4722,8 @@ static inline struct wined3d_shader_resource_view_vk *wined3d_shader_resource_vi HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_shader_resource_view_vk_update(struct wined3d_shader_resource_view_vk *view_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view {

1 0

Henri Verbeet : wined3d: Implement Vulkan sampler descriptors.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 2a9142de5ce016352bad613136fd7cbb3622af45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a9142de5ce016352bad6131… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 19:34:51 2020 +0430 wined3d: Implement Vulkan sampler descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4e4e064250..ba1f6bb926 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1335,6 +1335,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con struct wined3d_resource *resource; VkDescriptorSet vk_descriptor_set; struct wined3d_view_vk *view_vk; + struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; VkBufferView *buffer_view; VkDescriptorType type; @@ -1400,6 +1401,14 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, + VK_DESCRIPTOR_TYPE_SAMPLER, NULL, &wined3d_sampler_vk(sampler)->vk_image_info, NULL)) + return false; + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); return false; @@ -1506,6 +1515,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; + struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; size_t i; @@ -1551,6 +1561,12 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + wined3d_context_vk_reference_sampler(context_vk, wined3d_sampler_vk(sampler)); + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35b0815d95..93852e0de7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5662,6 +5662,12 @@ static inline void wined3d_context_vk_reference_texture(const struct wined3d_con texture_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_sampler(const struct wined3d_context_vk *context_vk, + struct wined3d_sampler_vk *sampler_vk) +{ + sampler_vk->command_buffer_id = context_vk->current_command_buffer.id; +} + static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk, struct wined3d_rendertarget_view_vk *rtv_vk) {

1 0

Henri Verbeet : wined3d: Implement Vulkan buffer unordered access view descriptors.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: d9db5298d6f959130dd03e1c975a1162c1a93931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9db5298d6f959130dd03e1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 19:34:52 2020 +0430 wined3d: Implement Vulkan buffer unordered access view descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/context_vk.c | 49 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/view.c | 28 ++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 14 ++++++++++++ 4 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8758627cb1..4dbbb0b80e 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1438,6 +1438,7 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac vk_buffer_view = &view_vk->u.vk_buffer_view; else vk_image_view = &view_vk->u.vk_image_info.imageView; + list_remove(&view_vk->bo_user.entry); wined3d_unordered_access_view_cleanup(&uav_vk->v); wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &uav_vk->counter_bo, &uav_vk->vk_counter_view, &view_vk->command_buffer_id, uav_vk); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ba1f6bb926..e31527f8be 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1329,6 +1329,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; + struct wined3d_unordered_access_view *uav; const VkDescriptorBufferInfo *buffer_info; struct wined3d_shader_resource_view *srv; const VkDescriptorImageInfo *image_info; @@ -1401,6 +1402,32 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV: + if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx])) + { + FIXME("NULL unordered access views not implemented.\n"); + return false; + } + resource = uav->resource; + + view_vk = &wined3d_unordered_access_view_vk(uav)->view_vk; + if (resource->type == WINED3D_RTYPE_BUFFER) + { + image_info = NULL; + buffer_view = &view_vk->u.vk_buffer_view; + type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + } + else + { + FIXME("Image UAVs not implemented.\n"); + return false; + } + + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, type, NULL, image_info, buffer_view)) + return false; + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) sampler = context_vk->c.device->null_sampler; @@ -1512,7 +1539,9 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; const struct wined3d_shader_resource_binding *binding; + struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_shader_resource_view_vk *srv_vk; + struct wined3d_unordered_access_view *uav; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; struct wined3d_sampler *sampler; @@ -1558,6 +1587,24 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * wined3d_context_vk_reference_shader_resource_view(context_vk, srv_vk); break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV: + if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx])) + break; + + uav_vk = wined3d_unordered_access_view_vk(uav); + if (uav->resource->type == WINED3D_RTYPE_BUFFER) + { + if (!uav_vk->view_vk.bo_user.valid) + { + wined3d_unordered_access_view_vk_update(uav_vk, context_vk); + context_invalidate_compute_state(&context_vk->c, STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING); + } + wined3d_buffer_load(buffer_from_resource(uav->resource), &context_vk->c, state); + wined3d_unordered_access_view_invalidate_location(uav, ~WINED3D_LOCATION_BUFFER); + } + wined3d_context_vk_reference_unordered_access_view(context_vk, uav_vk); + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; @@ -1568,7 +1615,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * break; default: - FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); + ERR("Invalid descriptor type %#x.\n", binding->shader_descriptor_type); break; } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4a75c69657..10fcd69513 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1478,6 +1478,25 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi return hr; } +void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *uav_vk, + struct wined3d_context_vk *context_vk) +{ + const struct wined3d_format_vk *view_format_vk = wined3d_format_vk(uav_vk->v.format); + const struct wined3d_view_desc *desc = &uav_vk->v.desc; + struct wined3d_resource *resource = uav_vk->v.resource; + struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + struct wined3d_buffer_vk *buffer_vk; + VkBufferView vk_buffer_view; + + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) + { + view_vk->u.vk_buffer_view = vk_buffer_view; + view_vk->bo_user.valid = true; + } +} + static void wined3d_unordered_access_view_vk_cs_init(void *object) { struct wined3d_unordered_access_view_vk *uav_vk = object; @@ -1488,6 +1507,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) struct wined3d_texture_vk *texture_vk; struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; + struct wined3d_buffer_vk *buffer_vk; VkBufferViewCreateInfo create_info; struct wined3d_resource *resource; VkBufferView vk_buffer_view; @@ -1501,15 +1521,18 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); vk_info = context_vk->vk_info; - if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, - desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk))) + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, format_vk))) { TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + uav_vk->view_vk.bo_user.valid = true; + list_add_head(&buffer_vk->bo.users, &view_vk->bo_user.entry); } if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) @@ -1597,6 +1620,7 @@ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_vi if (FAILED(hr = wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops))) return hr; + list_init(&view_vk->view_vk.bo_user.entry); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_vk_cs_init, view_vk); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93852e0de7..d9e8ffa816 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4784,6 +4784,8 @@ static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; struct wined3d_swapchain_state { @@ -5692,6 +5694,18 @@ static inline void wined3d_context_vk_reference_shader_resource_view(const struc srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk, + struct wined3d_unordered_access_view_vk *uav_vk) +{ + struct wined3d_resource *resource = uav_vk->v.resource; + + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; +} + static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) {

1 0