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

Nikolay Sivov : mf/evr: Add a stub for clock state sink.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 115ac283993013116af06f9d14e650e027d7f06d URL: https://source.winehq.org/git/wine.git/?a=commit;h=115ac283993013116af06f9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:34 2020 +0300 mf/evr: Add a stub for clock state sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 5 ++++ 2 files changed, 81 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index bb21ccdd25..aa4d3850c6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -34,6 +34,7 @@ struct video_renderer IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; IMFVideoRenderer IMFVideoRenderer_iface; + IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; @@ -64,6 +65,11 @@ static struct video_renderer *impl_from_IMFMediaEventGenerator(IMFMediaEventGene return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaEventGenerator_iface); } +static struct video_renderer *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFClockStateSink_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -87,6 +93,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFMediaEventGenerator_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &renderer->IMFClockStateSink_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -363,6 +373,71 @@ static const IMFMediaEventGeneratorVtbl video_renderer_events_vtbl = video_renderer_events_QueueEvent, }; +static HRESULT WINAPI video_renderer_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_clock_sink_AddRef(IMFClockStateSink *iface) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_clock_sink_Release(IMFClockStateSink *iface) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) +{ + FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) +{ + FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl video_renderer_clock_sink_vtbl = +{ + video_renderer_clock_sink_QueryInterface, + video_renderer_clock_sink_AddRef, + video_renderer_clock_sink_Release, + video_renderer_clock_sink_OnClockStart, + video_renderer_clock_sink_OnClockStop, + video_renderer_clock_sink_OnClockPause, + video_renderer_clock_sink_OnClockRestart, + video_renderer_clock_sink_OnClockSetRate, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -423,6 +498,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFMediaSinkPreroll_iface.lpVtbl = &video_renderer_preroll_vtbl; object->IMFVideoRenderer_iface.lpVtbl = &video_renderer_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &video_renderer_events_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &video_renderer_clock_sink_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5d9ccc5408..077466b7e8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3229,6 +3229,7 @@ static void test_evr(void) { IMFMediaEventGenerator *ev_generator; IMFVideoRenderer *video_renderer; + IMFClockStateSink *clock_sink; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; IMFActivate *activate; @@ -3272,6 +3273,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaEventGenerator_Release(ev_generator); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&clock_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFClockStateSink_Release(clock_sink); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Add IMFGetService stub.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: f557a5ee561faa215f2700b492daab789c82bee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f557a5ee561faa215f2700b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:35 2020 +0300 mf/evr: Add IMFGetService stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 5 +++++ 2 files changed, 49 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index aa4d3850c6..ebb3fd4c2c 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -36,6 +36,7 @@ struct video_renderer IMFVideoRenderer IMFVideoRenderer_iface; IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; + IMFGetService IMFGetService_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -70,6 +71,11 @@ static struct video_renderer *impl_from_IMFClockStateSink(IMFClockStateSink *ifa return CONTAINING_RECORD(iface, struct video_renderer, IMFClockStateSink_iface); } +static struct video_renderer *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFGetService_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -97,6 +103,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFClockStateSink_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &renderer->IMFGetService_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -438,6 +448,39 @@ static const IMFClockStateSinkVtbl video_renderer_clock_sink_vtbl = video_renderer_clock_sink_OnClockSetRate, }; +static HRESULT WINAPI video_renderer_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_get_service_AddRef(IMFGetService *iface) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_get_service_Release(IMFGetService *iface) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl video_renderer_get_service_vtbl = +{ + video_renderer_get_service_QueryInterface, + video_renderer_get_service_AddRef, + video_renderer_get_service_Release, + video_renderer_get_service_GetService, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -499,6 +542,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFVideoRenderer_iface.lpVtbl = &video_renderer_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &video_renderer_events_vtbl; object->IMFClockStateSink_iface.lpVtbl = &video_renderer_clock_sink_vtbl; + object->IMFGetService_iface.lpVtbl = &video_renderer_get_service_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 077466b7e8..3fad309bcf 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3234,6 +3234,7 @@ static void test_evr(void) IMFMediaSink *sink, *sink2; IMFActivate *activate; DWORD flags, count; + IMFGetService *gs; UINT64 value; HRESULT hr; @@ -3277,6 +3278,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFClockStateSink_Release(clock_sink); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Nikolay Sivov : evr: Respond to IMFVideoMixerControl in mixer's GetService().
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 52f8191b9348f0e5b183b81cb6f7a8e9787a64c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f8191b9348f0e5b183b81c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:36 2020 +0300 evr: Respond to IMFVideoMixerControl in mixer's GetService(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 +++- dlls/evr/tests/evr.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c8bd300b0d..f274a2a447 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1021,7 +1021,9 @@ static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, RE { if (IsEqualIID(riid, &IID_IMFVideoMixerBitmap) || IsEqualIID(riid, &IID_IMFVideoProcessor) || - IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + IsEqualIID(riid, &IID_IMFVideoPositionMapper) || + IsEqualIID(riid, &IID_IMFVideoMixerControl) || + IsEqualIID(riid, &IID_IMFVideoMixerControl2)) { return IMFGetService_QueryInterface(iface, riid, obj); } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index db9b3a80e0..5e18494718 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -450,6 +450,10 @@ static void test_default_mixer(void) hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Forward mixer service requests to the mixer.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 58f7c7823be66e81b1a212ab8be458185472d2bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f7c7823be66e81b1a212ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:37 2020 +0300 mf/evr: Forward mixer service requests to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 23 +++++++++++++++++++++-- dlls/mf/tests/mf.c | 6 ++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ebb3fd4c2c..8b7de5c76b 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -468,9 +468,28 @@ static ULONG WINAPI video_renderer_get_service_Release(IMFGetService *iface) static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + struct video_renderer *renderer = impl_from_IMFGetService(iface); + HRESULT hr = E_NOINTERFACE; + IMFGetService *gs = NULL; - return E_NOTIMPL; + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) + { + hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFGetService, (void **)&gs); + } + else + { + FIXME("Unsupported service %s.\n", debugstr_guid(service)); + } + + if (gs) + { + hr = IMFGetService_GetService(gs, service, riid, obj); + IMFGetService_Release(gs); + } + + return hr; } static const IMFGetServiceVtbl video_renderer_get_service_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 3fad309bcf..aa2c5199b9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3235,6 +3235,7 @@ static void test_evr(void) IMFActivate *activate; DWORD flags, count; IMFGetService *gs; + IUnknown *unk; UINT64 value; HRESULT hr; @@ -3280,6 +3281,11 @@ static void test_evr(void) hr = IMFMediaSink_QueryInterface(sink, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + IMFGetService_Release(gs); hr = IMFActivate_ShutdownObject(activate);

1 0

Nikolay Sivov : mf/evr: Forward presenter service requests to the presenter.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 612f96ae27a7a117e5d5260ab7c01f15b030c6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=612f96ae27a7a117e5d5260a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:38 2020 +0300 mf/evr: Forward presenter service requests to the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 8b7de5c76b..d20fb1a395 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -478,6 +478,10 @@ static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface { hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFGetService, (void **)&gs); } + else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) + { + hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFGetService, (void **)&gs); + } else { FIXME("Unsupported service %s.\n", debugstr_guid(service));

1 0

Piotr Caban : ucrtbase: Fix buffer overflow error when printing hexadecimal floating point number.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 61dbb53fefac9b825656468f858eeac06c98c9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61dbb53fefac9b825656468f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 8 19:47:40 2020 +0200 ucrtbase: Fix buffer overflow error when printing hexadecimal floating point number. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 69eb8b1955..81960c19f6 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -415,7 +415,7 @@ static inline int FUNC_NAME(pf_output_hex_fp)(FUNC_NAME(puts_clbk) pf_puts, void { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' } }; - APICHAR pfx[16], sfx[8], *p; + APICHAR pfx[4+MANT_BITS/4+1], sfx[8], *p; ULONGLONG mant; int len = 0, sfx_len = 0, r, exp;

1 0

Georg Lehmann : winevulkan: Unwrap object for VK_EXT_private_data when needed.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 380b7f28253c048d04c1fbd0cfbc7e804bb1b0e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=380b7f28253c048d04c1fbd0… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Jul 8 15:43:22 2020 +0200 winevulkan: Unwrap object for VK_EXT_private_data when needed. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 7 +++++++ dlls/winevulkan/vulkan.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 12 ------------ dlls/winevulkan/vulkan_thunks.h | 2 ++ 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a0bf6b0859..b84eb39587 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -217,6 +217,10 @@ FUNCTION_OVERRIDES = { # VK_KHR_device_group "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + + # VK_EXT_private_data + "vkGetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkSetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, } STRUCT_CHAIN_CONVERSIONS = [ @@ -919,6 +923,9 @@ class VkHandle(object): def native_handle(self, name): """ Provide access to the native handle of a wrapped object. """ + # Remember to add any new native handle whose parent is VkDevice + # to unwrap_object_handle() in vulkan.c + if self.name == "VkCommandPool": return "wine_cmd_pool_from_handle({0})->command_pool".format(name) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index d2da92cfa2..4642975ad0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1372,6 +1372,43 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDev properties->externalSemaphoreFeatures = 0; } +static uint64_t unwrap_object_handle(VkObjectType type, uint64_t handle) +{ + switch (type) + { + case VK_OBJECT_TYPE_DEVICE: + return (uint64_t) (uintptr_t) ((VkDevice) (uintptr_t) handle)->device; + case VK_OBJECT_TYPE_QUEUE: + return (uint64_t) (uintptr_t) ((VkQueue) (uintptr_t) handle)->queue; + case VK_OBJECT_TYPE_COMMAND_BUFFER: + return (uint64_t) (uintptr_t) ((VkCommandBuffer) (uintptr_t) handle)->command_buffer; + case VK_OBJECT_TYPE_COMMAND_POOL: + return (uint64_t) wine_cmd_pool_from_handle(handle)->command_pool; + default: + return handle; + } +} + +VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, + VkPrivateDataSlotEXT private_data_slot, uint64_t data) +{ + TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, object_type, wine_dbgstr_longlong(object_handle), + wine_dbgstr_longlong(private_data_slot), wine_dbgstr_longlong(data)); + + object_handle = unwrap_object_handle(object_type, object_handle); + return device->funcs.p_vkSetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); +} + +void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, + VkPrivateDataSlotEXT private_data_slot, uint64_t *data) +{ + TRACE("%p, %#x, 0x%s, 0x%s, %p\n", device, object_type, wine_dbgstr_longlong(object_handle), + wine_dbgstr_longlong(private_data_slot), data); + + object_handle = unwrap_object_handle(object_type, object_handle); + device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index f8d171a6db..94aa1e3fb7 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5066,12 +5066,6 @@ static VkResult WINAPI wine_vkGetPipelineExecutableStatisticsKHR(VkDevice device #endif } -static void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) -{ - TRACE("%p, %#x, 0x%s, 0x%s, %p\n", device, objectType, wine_dbgstr_longlong(objectHandle), wine_dbgstr_longlong(privateDataSlot), pData); - device->funcs.p_vkGetPrivateDataEXT(device->device, objectType, objectHandle, privateDataSlot, pData); -} - VkResult WINAPI wine_vkGetQueryPoolResults(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void *pData, VkDeviceSize stride, VkQueryResultFlags flags) { TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", device, wine_dbgstr_longlong(queryPool), firstQuery, queryCount, wine_dbgstr_longlong(dataSize), pData, wine_dbgstr_longlong(stride), flags); @@ -5264,12 +5258,6 @@ VkResult WINAPI wine_vkSetEvent(VkDevice device, VkEvent event) return device->funcs.p_vkSetEvent(device->device, event); } -static VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) -{ - TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, objectType, wine_dbgstr_longlong(objectHandle), wine_dbgstr_longlong(privateDataSlot), wine_dbgstr_longlong(data)); - return device->funcs.p_vkSetPrivateDataEXT(device->device, objectType, objectHandle, privateDataSlot, data); -} - VkResult WINAPI wine_vkSignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo) { #if defined(USE_STRUCT_CONVERSION) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 9580c6bbcd..7055d4fb13 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -40,7 +40,9 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); +VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN; /* Private thunks */ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN;

1 0

Georg Lehmann : vulkan-1: Add test for VK_EXT_private_data.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 262e4ab9e0eeb126dde5cb4cba13fbf7f1d1cef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=262e4ab9e0eeb126dde5cb4c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Jul 8 15:43:23 2020 +0200 vulkan-1: Add test for VK_EXT_private_data. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 6f9e9f115c..9061b2b6db 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -387,6 +387,56 @@ static void test_unsupported_device_extensions(VkPhysicalDevice vk_physical_devi } } +static void test_private_data(VkPhysicalDevice vk_physical_device) +{ + PFN_vkDestroyPrivateDataSlotEXT pfn_vkDestroyPrivateDataSlotEXT; + PFN_vkCreatePrivateDataSlotEXT pfn_vkCreatePrivateDataSlotEXT; + VkPrivateDataSlotCreateInfoEXT data_create_info; + PFN_vkGetPrivateDataEXT pfn_vkGetPrivateDataEXT; + PFN_vkSetPrivateDataEXT pfn_vkSetPrivateDataEXT; + VkPrivateDataSlotEXT data_slot; + VkDevice vk_device; + uint64_t data; + VkResult vr; + + static const uint64_t data_value = 0x70AD; + + static const char *ext_name = "VK_EXT_private_data"; + + if ((vr = create_device(vk_physical_device, 1, &ext_name, NULL, &vk_device)) < 0) + { + skip("Failed to create device with VK_EXT_private_data, VkResult %d.\n", vr); + return; + } + + pfn_vkDestroyPrivateDataSlotEXT = + (void*) vkGetDeviceProcAddr(vk_device, "vkDestroyPrivateDataSlotEXT"); + pfn_vkCreatePrivateDataSlotEXT = + (void*) vkGetDeviceProcAddr(vk_device, "vkCreatePrivateDataSlotEXT"); + pfn_vkGetPrivateDataEXT = + (void*) vkGetDeviceProcAddr(vk_device, "vkGetPrivateDataEXT"); + pfn_vkSetPrivateDataEXT = + (void*) vkGetDeviceProcAddr(vk_device, "vkSetPrivateDataEXT"); + + data_create_info.sType = VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT; + data_create_info.pNext = NULL; + data_create_info.flags = 0; + vr = pfn_vkCreatePrivateDataSlotEXT(vk_device, &data_create_info, NULL, &data_slot); + ok(vr == VK_SUCCESS, "Failed to create private data slot, VkResult %d.\n", vr); + + vr = pfn_vkSetPrivateDataEXT(vk_device, VK_OBJECT_TYPE_DEVICE, + (uint64_t) (uintptr_t) vk_device, data_slot, data_value); + ok(vr == VK_SUCCESS, "Failed to set private data, VkResult %d.\n", vr); + + pfn_vkGetPrivateDataEXT(vk_device, VK_OBJECT_TYPE_DEVICE, + (uint64_t) (uintptr_t) vk_device, data_slot, &data); + ok(data == data_value, "Got unexpected private data, %s.\n", + wine_dbgstr_longlong(data)); + + pfn_vkDestroyPrivateDataSlotEXT(vk_device, data_slot, NULL); + vkDestroyDevice(vk_device, NULL); +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -430,4 +480,5 @@ START_TEST(vulkan) for_each_device(test_destroy_command_pool); test_unsupported_instance_extensions(); for_each_device(test_unsupported_device_extensions); + for_each_device(test_private_data); }

1 0

Zebediah Figura : d3dcompiler: Allow hlsl_ir_constant to contain only scalar and vector constants.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 2ccf1db285310abb86f3712703727ebcbf7f0916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ccf1db285310abb86f37127… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 5 17:45:34 2020 -0500 d3dcompiler: Allow hlsl_ir_constant to contain only scalar and vector constants. We only emit scalar constants at parse time, and while there's certainly an advantage to vectorizing constant instructions, there's not much point in having hlsl_ir_constant hold matrices. Matrices should be lowered to vector operations first. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 +++--- dlls/d3dcompiler_43/utils.c | 51 +++++++++++++------------------ 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 23eff21094..3e91f74645 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -874,11 +874,11 @@ struct hlsl_ir_constant struct hlsl_ir_node node; union { - unsigned u[16]; - int i[16]; - float f[16]; - double d[16]; - BOOL b[16]; + unsigned u[4]; + int i[4]; + float f[4]; + double d[4]; + BOOL b[4]; } value; }; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 4bc3b9b0a6..7f0c451ce9 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1823,41 +1823,34 @@ static void debug_dump_deref(const struct hlsl_deref *deref) static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) { struct hlsl_type *type = constant->node.data_type; - unsigned int x, y; + unsigned int x; - if (type->dimy != 1) + if (type->dimx != 1) wine_dbg_printf("{"); - for (y = 0; y < type->dimy; ++y) + for (x = 0; x < type->dimx; ++x) { - if (type->dimx != 1) - wine_dbg_printf("{"); - for (x = 0; x < type->dimx; ++x) + switch (type->base_type) { - switch (type->base_type) - { - case HLSL_TYPE_FLOAT: - wine_dbg_printf("%.8e ", constant->value.f[y * type->dimx + x]); - break; - case HLSL_TYPE_DOUBLE: - wine_dbg_printf("%.16e ", constant->value.d[y * type->dimx + x]); - break; - case HLSL_TYPE_INT: - wine_dbg_printf("%d ", constant->value.i[y * type->dimx + x]); - break; - case HLSL_TYPE_UINT: - wine_dbg_printf("%u ", constant->value.u[y * type->dimx + x]); - break; - case HLSL_TYPE_BOOL: - wine_dbg_printf("%s ", constant->value.b[y * type->dimx + x] == FALSE ? "false" : "true"); - break; - default: - wine_dbg_printf("Constants of type %s not supported\n", debug_base_type(type)); - } + case HLSL_TYPE_FLOAT: + wine_dbg_printf("%.8e ", constant->value.f[x]); + break; + case HLSL_TYPE_DOUBLE: + wine_dbg_printf("%.16e ", constant->value.d[x]); + break; + case HLSL_TYPE_INT: + wine_dbg_printf("%d ", constant->value.i[x]); + break; + case HLSL_TYPE_UINT: + wine_dbg_printf("%u ", constant->value.u[x]); + break; + case HLSL_TYPE_BOOL: + wine_dbg_printf("%s ", constant->value.b[x] ? "true" : "false"); + break; + default: + wine_dbg_printf("Constants of type %s not supported\n", debug_base_type(type)); } - if (type->dimx != 1) - wine_dbg_printf("}"); } - if (type->dimy != 1) + if (type->dimx != 1) wine_dbg_printf("}"); }

1 0

Zebediah Figura : d3dcompiler: Store the "then" and "else" instruction lists directly in the hlsl_ir_if structure.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 0a9f2d8b0a5394a0803c418c726ef4da488e15e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a9f2d8b0a5394a0803c418c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 7 23:09:24 2020 +0200 d3dcompiler: Store the "then" and "else" instruction lists directly in the hlsl_ir_if structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 +-- dlls/d3dcompiler_43/hlsl.y | 51 +++++++++++++++---------------- dlls/d3dcompiler_43/utils.c | 18 +++++------ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3e91f74645..4bf1ce8f1b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -742,8 +742,8 @@ struct hlsl_ir_if { struct hlsl_ir_node node; struct hlsl_src condition; - struct list *then_instrs; - struct list *else_instrs; + struct list then_instrs; + struct list else_instrs; }; struct hlsl_ir_loop diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 475fd414fd..3c9f1bd604 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -284,6 +284,19 @@ static BOOL type_is_void(const struct hlsl_type *type) return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; } +static struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) +{ + struct hlsl_ir_if *iff; + + if (!(iff = d3dcompiler_alloc(sizeof(*iff)))) + return NULL; + init_node(&iff->node, HLSL_IR_IF, NULL, loc); + hlsl_src_from_node(&iff->condition, condition); + list_init(&iff->then_instrs); + list_init(&iff->else_instrs); + return iff; +} + static BOOL append_conditional_break(struct list *cond_list) { struct hlsl_ir_node *condition, *not; @@ -302,22 +315,13 @@ static BOOL append_conditional_break(struct list *cond_list) } list_add_tail(cond_list, &not->entry); - if (!(iff = d3dcompiler_alloc(sizeof(*iff)))) + if (!(iff = new_if(not, condition->loc))) { ERR("Out of memory.\n"); return FALSE; } - init_node(&iff->node, HLSL_IR_IF, NULL, condition->loc); - hlsl_src_from_node(&iff->condition, not); list_add_tail(cond_list, &iff->node.entry); - if (!(iff->then_instrs = d3dcompiler_alloc(sizeof(*iff->then_instrs)))) - { - ERR("Out of memory.\n"); - return FALSE; - } - list_init(iff->then_instrs); - if (!(jump = d3dcompiler_alloc(sizeof(*jump)))) { ERR("Out of memory.\n"); @@ -325,7 +329,7 @@ static BOOL append_conditional_break(struct list *cond_list) } init_node(&jump->node, HLSL_IR_JUMP, NULL, condition->loc); jump->type = HLSL_IR_JUMP_BREAK; - list_add_head(iff->then_instrs, &jump->node.entry); + list_add_head(&iff->then_instrs, &jump->node.entry); return TRUE; } @@ -2211,18 +2215,15 @@ jump_statement: selection_statement: KW_IF '(' expr ')' if_body { - struct hlsl_ir_if *instr = d3dcompiler_alloc(sizeof(*instr)); struct hlsl_ir_node *condition = node_from_list($3); + struct hlsl_ir_if *instr; - if (!instr) - { - ERR("Out of memory\n"); + if (!(instr = new_if(condition, get_location(&@1)))) YYABORT; - } - init_node(&instr->node, HLSL_IR_IF, NULL, get_location(&@1)); - hlsl_src_from_node(&instr->condition, condition); - instr->then_instrs = $5.then_instrs; - instr->else_instrs = $5.else_instrs; + list_move_tail(&instr->then_instrs, $5.then_instrs); + list_move_tail(&instr->else_instrs, $5.else_instrs); + d3dcompiler_free($5.then_instrs); + d3dcompiler_free($5.else_instrs); if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) { hlsl_report_message(instr->node.loc, HLSL_LEVEL_ERROR, @@ -2851,9 +2852,8 @@ static unsigned int index_instructions(struct list *instrs, unsigned int index) if (instr->type == HLSL_IR_IF) { struct hlsl_ir_if *iff = if_from_node(instr); - index = index_instructions(iff->then_instrs, index); - if (iff->else_instrs) - index = index_instructions(iff->else_instrs, index); + index = index_instructions(&iff->then_instrs, index); + index = index_instructions(&iff->else_instrs, index); } else if (instr->type == HLSL_IR_LOOP) { @@ -2902,9 +2902,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs case HLSL_IR_IF: { struct hlsl_ir_if *iff = if_from_node(instr); - compute_liveness_recurse(iff->then_instrs, loop_first, loop_last); - if (iff->else_instrs) - compute_liveness_recurse(iff->else_instrs, loop_first, loop_last); + compute_liveness_recurse(&iff->then_instrs, loop_first, loop_last); + compute_liveness_recurse(&iff->else_instrs, loop_first, loop_last); iff->condition.node->last_read = instr->index; break; } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 7f0c451ce9..8599ffe69a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2018,14 +2018,10 @@ static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) wine_dbg_printf("if ("); debug_dump_src(&if_node->condition); wine_dbg_printf(")\n{\n"); - debug_dump_instr_list(if_node->then_instrs); + debug_dump_instr_list(&if_node->then_instrs); + wine_dbg_printf("}\nelse\n{\n"); + debug_dump_instr_list(&if_node->else_instrs); wine_dbg_printf("}\n"); - if (if_node->else_instrs) - { - wine_dbg_printf("else\n{\n"); - debug_dump_instr_list(if_node->else_instrs); - wine_dbg_printf("}\n"); - } } static void debug_dump_ir_loop(const struct hlsl_ir_loop *loop) @@ -2157,8 +2153,12 @@ static void free_ir_assignment(struct hlsl_ir_assignment *assignment) static void free_ir_if(struct hlsl_ir_if *if_node) { - free_instr_list(if_node->then_instrs); - free_instr_list(if_node->else_instrs); + struct hlsl_ir_node *node, *next_node; + + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->then_instrs, struct hlsl_ir_node, entry) + free_instr(node); + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->else_instrs, struct hlsl_ir_node, entry) + free_instr(node); hlsl_src_remove(&if_node->condition); d3dcompiler_free(if_node); }

1 0