June 2023 - Wine-commits - list.winehq.org

Rémi Bernon : winegstreamer: Return a IMFMediaSource from media_source_constructor.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 70efc785d521c5bd15fcb95c7ffae9d0a74df007 URL: https://gitlab.winehq.org/wine/wine/-/commit/70efc785d521c5bd15fcb95c7ffae9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 28 09:52:35 2023 +0200 winegstreamer: Return a IMFMediaSource from media_source_constructor. --- dlls/winegstreamer/media_source.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 0fb41c0e8db..cc501ce5c59 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1520,7 +1520,7 @@ static void media_source_init_descriptors(struct media_source *source) } } -static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) +static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **out) { unsigned int stream_count = UINT_MAX; struct media_source *object; @@ -1622,10 +1622,11 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ media_source_init_descriptors(object); object->state = SOURCE_STOPPED; - *out_media_source = object; + *out = &object->IMFMediaSource_iface; + TRACE("Created IMFMediaSource %p\n", *out); return S_OK; - fail: +fail: WARN("Failed to construct MFMediaSource, hr %#lx.\n", hr); while (object->streams && object->stream_count--) @@ -1979,28 +1980,10 @@ static HRESULT WINAPI stream_handler_callback_GetParameters(IMFAsyncCallback *if return E_NOTIMPL; } -static HRESULT stream_handler_create_object(struct stream_handler *handler, WCHAR *url, IMFByteStream *stream, - IUnknown **out_object) -{ - HRESULT hr; - struct media_source *new_source; - - TRACE("%p, %s, %p, %p.\n", handler, debugstr_w(url), stream, out_object); - - if (FAILED(hr = media_source_constructor(stream, &new_source))) - return hr; - - TRACE("->(%p)\n", new_source); - - *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; - - return S_OK; -} - static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct stream_handler *handler = impl_from_IMFAsyncCallback(iface); - IUnknown *object = NULL, *context_object; + IUnknown *object, *context_object; struct create_object_context *context; struct result_entry *entry; IMFAsyncResult *caller; @@ -2016,8 +1999,8 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM context = impl_from_IUnknown(context_object); - if (FAILED(hr = stream_handler_create_object(handler, context->url, context->stream, &object))) - WARN("Failed to create object, hr %#lx\n", hr); + if (FAILED(hr = media_source_create(context->stream, (IMFMediaSource **)&object))) + WARN("Failed to create media source, hr %#lx\n", hr); else { if (FAILED(hr = result_entry_create(caller, MF_OBJECT_MEDIASOURCE, object, &entry)))

1 0

Rémi Bernon : winegstreamer: Keep the caller result in create_object_context.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 5a9450db7f2660b929184164ffba1e9604ac5179 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a9450db7f2660b929184164ffba1e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 19 16:48:10 2023 +0200 winegstreamer: Keep the caller result in create_object_context. --- dlls/winegstreamer/media_source.c | 52 +++++++++++++++------------------------ 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index cc501ce5c59..891961a6ccd 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1779,6 +1779,7 @@ struct create_object_context IUnknown IUnknown_iface; LONG refcount; + IMFAsyncResult *result; IMFByteStream *stream; WCHAR *url; }; @@ -1823,6 +1824,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) if (!refcount) { + IMFAsyncResult_Release(context->result); IMFByteStream_Release(context->stream); free(context->url); free(context); @@ -1843,7 +1845,7 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa { struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface); struct create_object_context *context; - IMFAsyncResult *caller, *item; + IMFAsyncResult *result; HRESULT hr; TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); @@ -1856,12 +1858,12 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (flags != MF_RESOLUTION_MEDIASOURCE) FIXME("Unimplemented flags %#lx\n", flags); - if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr; if (!(context = calloc(1, sizeof(*context)))) { - IMFAsyncResult_Release(caller); + IMFAsyncResult_Release(result); return E_OUTOFMEMORY; } @@ -1869,25 +1871,21 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa context->refcount = 1; context->stream = stream; IMFByteStream_AddRef(context->stream); + context->result = result; + IMFAsyncResult_AddRef(context->result); if (url) context->url = wcsdup(url); - hr = MFCreateAsyncResult(&context->IUnknown_iface, &handler->IMFAsyncCallback_iface, (IUnknown *)caller, &item); + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_IO, &handler->IMFAsyncCallback_iface, &context->IUnknown_iface); IUnknown_Release(&context->IUnknown_iface); - if (SUCCEEDED(hr)) - { - if (SUCCEEDED(hr = MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_IO, item))) - { - if (cancel_cookie) - { - *cancel_cookie = (IUnknown *)caller; - IUnknown_AddRef(*cancel_cookie); - } - } - IMFAsyncResult_Release(item); + if (SUCCEEDED(hr) && cancel_cookie) + { + *cancel_cookie = (IUnknown *)result; + IUnknown_AddRef(*cancel_cookie); } - IMFAsyncResult_Release(caller); + + IMFAsyncResult_Release(result); return hr; } @@ -1983,27 +1981,19 @@ static HRESULT WINAPI stream_handler_callback_GetParameters(IMFAsyncCallback *if static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct stream_handler *handler = impl_from_IMFAsyncCallback(iface); - IUnknown *object, *context_object; + IUnknown *object, *state = IMFAsyncResult_GetStateNoAddRef(result); struct create_object_context *context; struct result_entry *entry; - IMFAsyncResult *caller; HRESULT hr; - caller = (IMFAsyncResult *)IMFAsyncResult_GetStateNoAddRef(result); - - if (FAILED(hr = IMFAsyncResult_GetObject(result, &context_object))) - { - WARN("Expected context set for callee result.\n"); - return hr; - } - - context = impl_from_IUnknown(context_object); + if (!state || !(context = impl_from_IUnknown(state))) + return E_INVALIDARG; if (FAILED(hr = media_source_create(context->stream, (IMFMediaSource **)&object))) WARN("Failed to create media source, hr %#lx\n", hr); else { - if (FAILED(hr = result_entry_create(caller, MF_OBJECT_MEDIASOURCE, object, &entry))) + if (FAILED(hr = result_entry_create(context->result, MF_OBJECT_MEDIASOURCE, object, &entry))) WARN("Failed to create handler result, hr %#lx\n", hr); else { @@ -2015,10 +2005,8 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM IUnknown_Release(object); } - IUnknown_Release(&context->IUnknown_iface); - - IMFAsyncResult_SetStatus(caller, hr); - MFInvokeCallback(caller); + IMFAsyncResult_SetStatus(context->result, hr); + MFInvokeCallback(context->result); return S_OK; }

1 0

Arkadiusz Hiler : win32u: Don't affect nonclient area unless requested.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: d4b2865eb7f2612e52b3fee6ae121e59c2d28296 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4b2865eb7f2612e52b3fee6ae121e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Jun 27 23:01:34 2023 +0300 win32u: Don't affect nonclient area unless requested. The state of the caption / nonclient area should be only changed when FLASHW_CAPTION or FLASHW_STOP are used. --- dlls/win32u/window.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 871227645a7..f008735f2e3 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4511,11 +4511,11 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) win = get_win_ptr( info->hwnd ); if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; - if (info->dwFlags && !(win->flags & WIN_NCACTIVATED)) + if (info->dwFlags & FLASHW_CAPTION && !(win->flags & WIN_NCACTIVATED)) { win->flags |= WIN_NCACTIVATED; } - else + else if (!info->dwFlags) { win->flags &= ~WIN_NCACTIVATED; } @@ -4536,7 +4536,10 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) else wparam = (hwnd == NtUserGetForegroundWindow()); release_win_ptr( win ); - send_message( hwnd, WM_NCACTIVATE, wparam, 0 ); + + if (!info->dwFlags || info->dwFlags & FLASHW_CAPTION) + send_message( hwnd, WM_NCACTIVATE, wparam, 0 ); + user_driver->pFlashWindowEx( info ); return wparam; }

1 0

Hans Leidekker : winscard: Implement SCARD_AUTOALLOCATE for multi-string return values.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 08a4a9803d823b10b990b0dfd00d88c27a73d1bd URL: https://gitlab.winehq.org/wine/wine/-/commit/08a4a9803d823b10b990b0dfd00d88… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 26 13:57:41 2023 +0200 winscard: Implement SCARD_AUTOALLOCATE for multi-string return values. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55137 --- dlls/winscard/tests/winscard.c | 17 ++- dlls/winscard/winscard.c | 244 +++++++++++++++++++++++++---------------- 2 files changed, 162 insertions(+), 99 deletions(-)

1 0

Xin Xu : include: Fix spelling error in InterlockedDecrementSizeT().
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: d291f40472923cfe614589a53b9eb5a9345292a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/d291f40472923cfe614589a53b9eb5… Author: Xin Xu <xxsemail(a)qq.com> Date: Wed Jun 28 19:56:00 2023 +0800 include: Fix spelling error in InterlockedDecrementSizeT(). --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index c0967ac4459..8d803eaceb1 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7184,13 +7184,13 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 #endif -#define InterlockedDecrementSizeT(a) InterlockeDecrement64((LONGLONG *)(a)) +#define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONGLONG *)(a)) #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)(a), (b)) #define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONGLONG *)(a)) #else /* _WIN64 */ -#define InterlockedDecrementSizeT(a) InterlockeDecrement((LONG *)(a)) +#define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)(a)) #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)(a), (b)) #define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)(a))

1 0

Nikolay Sivov : vkd3d-shader: Unify static string arrays initialization pattern.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: 69f32796b02c7c7651eb556cc7b881a5f8d7f1d7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/69f32796b02c7c7651eb556cc7b88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 12 12:29:35 2023 +0200 vkd3d-shader: Unify static string arrays initialization pattern. --- libs/vkd3d-common/debug.c | 10 +++++----- libs/vkd3d-shader/d3d_asm.c | 48 ++++++++++++++++++++++----------------------- libs/vkd3d-shader/hlsl.c | 32 +++++++++++++++--------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index b363efbd..4e4af5f9 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -44,11 +44,11 @@ extern const char *const vkd3d_dbg_env_name; static const char *const debug_level_names[] = { - /* VKD3D_DBG_LEVEL_NONE */ "none", - /* VKD3D_DBG_LEVEL_ERR */ "err", - /* VKD3D_DBG_LEVEL_FIXME */ "fixme", - /* VKD3D_DBG_LEVEL_WARN */ "warn", - /* VKD3D_DBG_LEVEL_TRACE */ "trace", + [VKD3D_DBG_LEVEL_NONE ] = "none", + [VKD3D_DBG_LEVEL_ERR ] = "err", + [VKD3D_DBG_LEVEL_FIXME] = "fixme", + [VKD3D_DBG_LEVEL_WARN ] = "warn", + [VKD3D_DBG_LEVEL_TRACE] = "trace", }; enum vkd3d_dbg_level vkd3d_dbg_get_level(void) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 0a821b5c..d72402eb 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -578,17 +578,17 @@ static void shader_dump_resource_type(struct vkd3d_d3d_asm_compiler *compiler, e { static const char *const resource_type_names[] = { - /* VKD3D_SHADER_RESOURCE_NONE */ "none", - /* VKD3D_SHADER_RESOURCE_BUFFER */ "buffer", - /* VKD3D_SHADER_RESOURCE_TEXTURE_1D */ "texture1d", - /* VKD3D_SHADER_RESOURCE_TEXTURE_2D */ "texture2d", - /* VKD3D_SHADER_RESOURCE_TEXTURE_2DMS */ "texture2dms", - /* VKD3D_SHADER_RESOURCE_TEXTURE_3D */ "texture3d", - /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBE */ "texturecube", - /* VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ "texture1darray", - /* VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ "texture2darray", - /* VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ "texture2dmsarray", - /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", + [VKD3D_SHADER_RESOURCE_NONE ] = "none", + [VKD3D_SHADER_RESOURCE_BUFFER ] = "buffer", + [VKD3D_SHADER_RESOURCE_TEXTURE_1D ] = "texture1d", + [VKD3D_SHADER_RESOURCE_TEXTURE_2D ] = "texture2d", + [VKD3D_SHADER_RESOURCE_TEXTURE_2DMS ] = "texture2dms", + [VKD3D_SHADER_RESOURCE_TEXTURE_3D ] = "texture3d", + [VKD3D_SHADER_RESOURCE_TEXTURE_CUBE ] = "texturecube", + [VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY ] = "texture1darray", + [VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY ] = "texture2darray", + [VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY] = "texture2dmsarray", + [VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY] = "texturecubearray", }; if (type < ARRAY_SIZE(resource_type_names)) @@ -601,19 +601,19 @@ static void shader_dump_data_type(struct vkd3d_d3d_asm_compiler *compiler, const { static const char *const data_type_names[] = { - /* VKD3D_DATA_FLOAT */ "float", - /* VKD3D_DATA_INT */ "int", - /* VKD3D_DATA_RESOURCE */ "resource", - /* VKD3D_DATA_SAMPLER */ "sampler", - /* VKD3D_DATA_UAV */ "uav", - /* VKD3D_DATA_UINT */ "uint", - /* VKD3D_DATA_UNORM */ "unorm", - /* VKD3D_DATA_SNORM */ "snorm", - /* VKD3D_DATA_OPAQUE */ "opaque", - /* VKD3D_DATA_MIXED */ "mixed", - /* VKD3D_DATA_DOUBLE */ "double", - /* VKD3D_DATA_CONTINUED */ "<continued>", - /* VKD3D_DATA_UNUSED */ "<unused>", + [VKD3D_DATA_FLOAT ] = "float", + [VKD3D_DATA_INT ] = "int", + [VKD3D_DATA_RESOURCE ] = "resource", + [VKD3D_DATA_SAMPLER ] = "sampler", + [VKD3D_DATA_UAV ] = "uav", + [VKD3D_DATA_UINT ] = "uint", + [VKD3D_DATA_UNORM ] = "unorm", + [VKD3D_DATA_SNORM ] = "snorm", + [VKD3D_DATA_OPAQUE ] = "opaque", + [VKD3D_DATA_MIXED ] = "mixed", + [VKD3D_DATA_DOUBLE ] = "double", + [VKD3D_DATA_CONTINUED] = "<continued>", + [VKD3D_DATA_UNUSED ] = "<unused>", }; const char *name; int i; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index acc2a89c..3a1e1779 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2124,18 +2124,18 @@ const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) { static const char * const names[] = { - "HLSL_IR_CALL", - "HLSL_IR_CONSTANT", - "HLSL_IR_EXPR", - "HLSL_IR_IF", - "HLSL_IR_INDEX", - "HLSL_IR_LOAD", - "HLSL_IR_LOOP", - "HLSL_IR_JUMP", - "HLSL_IR_RESOURCE_LOAD", - "HLSL_IR_RESOURCE_STORE", - "HLSL_IR_STORE", - "HLSL_IR_SWIZZLE", + [HLSL_IR_CALL ] = "HLSL_IR_CALL", + [HLSL_IR_CONSTANT ] = "HLSL_IR_CONSTANT", + [HLSL_IR_EXPR ] = "HLSL_IR_EXPR", + [HLSL_IR_IF ] = "HLSL_IR_IF", + [HLSL_IR_INDEX ] = "HLSL_IR_INDEX", + [HLSL_IR_LOAD ] = "HLSL_IR_LOAD", + [HLSL_IR_LOOP ] = "HLSL_IR_LOOP", + [HLSL_IR_JUMP ] = "HLSL_IR_JUMP", + [HLSL_IR_RESOURCE_LOAD ] = "HLSL_IR_RESOURCE_LOAD", + [HLSL_IR_RESOURCE_STORE] = "HLSL_IR_RESOURCE_STORE", + [HLSL_IR_STORE ] = "HLSL_IR_STORE", + [HLSL_IR_SWIZZLE ] = "HLSL_IR_SWIZZLE", }; if (type >= ARRAY_SIZE(names)) @@ -2147,11 +2147,11 @@ const char *hlsl_jump_type_to_string(enum hlsl_ir_jump_type type) { static const char * const names[] = { - [HLSL_IR_JUMP_BREAK] = "HLSL_IR_JUMP_BREAK", - [HLSL_IR_JUMP_CONTINUE] = "HLSL_IR_JUMP_CONTINUE", + [HLSL_IR_JUMP_BREAK] = "HLSL_IR_JUMP_BREAK", + [HLSL_IR_JUMP_CONTINUE] = "HLSL_IR_JUMP_CONTINUE", [HLSL_IR_JUMP_DISCARD_NEG] = "HLSL_IR_JUMP_DISCARD_NEG", - [HLSL_IR_JUMP_DISCARD_NZ] = "HLSL_IR_JUMP_DISCARD_NZ", - [HLSL_IR_JUMP_RETURN] = "HLSL_IR_JUMP_RETURN", + [HLSL_IR_JUMP_DISCARD_NZ] = "HLSL_IR_JUMP_DISCARD_NZ", + [HLSL_IR_JUMP_RETURN] = "HLSL_IR_JUMP_RETURN", }; assert(type < ARRAY_SIZE(names));

1 0

Zebediah Figura : tests: Move HLSL tests to a subdirectory.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: 0d2f2e1860e439a14f849cf58857722bd7df6f7b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d2f2e1860e439a14f849cf588577… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 23 18:04:52 2023 -0500 tests: Move HLSL tests to a subdirectory. --- Makefile.am | 280 ++++++++++----------- tests/{ => hlsl}/abs.shader_test | 0 tests/{ => hlsl}/all.shader_test | 0 tests/{ => hlsl}/any.shader_test | 0 .../arithmetic-float-uniform.shader_test | 0 tests/{ => hlsl}/arithmetic-float.shader_test | 0 .../{ => hlsl}/arithmetic-int-uniform.shader_test | 0 tests/{ => hlsl}/arithmetic-int.shader_test | 0 tests/{ => hlsl}/arithmetic-uint.shader_test | 0 .../array-dimension.shader_test} | 0 tests/{ => hlsl}/array-index-expr.shader_test | 0 tests/{ => hlsl}/array-parameters.shader_test | 0 .../array-size-expr.shader_test} | 0 tests/{ => hlsl}/asfloat.shader_test | 0 tests/{ => hlsl}/asuint.shader_test | 0 .../attributes.shader_test} | 0 tests/{ => hlsl}/bitwise.shader_test | 0 .../bool-cast.shader_test} | 0 tests/{ => hlsl}/bool-semantics.shader_test | 0 tests/{ => hlsl}/cast-broadcast.shader_test | 0 .../cast-componentwise-compatible.shader_test | 0 .../cast-componentwise-equal.shader_test | 0 tests/{ => hlsl}/cast-to-float.shader_test | 0 tests/{ => hlsl}/cast-to-half.shader_test | 0 tests/{ => hlsl}/cast-to-int.shader_test | 0 tests/{ => hlsl}/cast-to-uint.shader_test | 0 tests/{ => hlsl}/cbuffer.shader_test | 0 .../clamp.shader_test} | 0 .../clip.shader_test} | 0 .../comma.shader_test} | 0 tests/{ => hlsl}/compute.shader_test | 0 tests/{ => hlsl}/conditional.shader_test | 0 .../cross.shader_test} | 0 .../d3dcolor-to-ubyte4.shader_test} | 0 tests/{ => hlsl}/ddxddy.shader_test | 0 .../discard.shader_test} | 0 tests/{ => hlsl}/distance.shader_test | 0 .../{hlsl-dot.shader_test => hlsl/dot.shader_test} | 0 .../duplicate-modifiers.shader_test} | 0 tests/{ => hlsl}/entry-point-semantics.shader_test | 0 tests/{ => hlsl}/exp.shader_test | 0 tests/{ => hlsl}/expr-indexing.shader_test | 0 tests/{ => hlsl}/floor.shader_test | 0 tests/{ => hlsl}/fmod.shader_test | 0 .../{hlsl-for.shader_test => hlsl/for.shader_test} | 0 tests/{ => hlsl}/frac.shader_test | 0 .../function-cast.shader_test} | 0 .../function-overload.shader_test} | 0 tests/{ => hlsl}/function-return.shader_test | 0 .../function.shader_test} | 0 .../gather-offset.shader_test} | 0 .../gather.shader_test} | 0 .../initializer-flatten.shader_test} | 0 .../initializer-implicit-array.shader_test} | 0 .../initializer-invalid-arg-count.shader_test} | 0 .../initializer-local-array.shader_test} | 0 .../initializer-matrix.shader_test} | 0 .../initializer-nested.shader_test} | 0 .../initializer-numeric.shader_test} | 0 .../initializer-objects.shader_test} | 0 .../initializer-static-array.shader_test} | 0 .../initializer-struct.shader_test} | 0 .../intrinsic-override.shader_test} | 0 .../invalid.shader_test} | 0 .../is-front-face.shader_test} | 0 .../ldexp.shader_test} | 0 .../length.shader_test} | 0 .../lerp.shader_test} | 0 tests/{ => hlsl}/lit.shader_test | 0 tests/{ => hlsl}/load-level.shader_test | 0 tests/{ => hlsl}/log.shader_test | 0 tests/{ => hlsl}/logic-operations.shader_test | 0 tests/{ => hlsl}/loop.shader_test | 0 .../majority-pragma.shader_test} | 0 tests/{ => hlsl}/majority-syntax.shader_test | 0 .../majority-typedef.shader_test} | 0 tests/{ => hlsl}/math.shader_test | 0 .../matrix-indexing.shader_test} | 0 tests/{ => hlsl}/matrix-semantics.shader_test | 0 tests/{ => hlsl}/max.shader_test | 0 tests/{ => hlsl}/minimum-precision.shader_test | 0 .../{hlsl-mul.shader_test => hlsl/mul.shader_test} | 0 tests/{ => hlsl}/multiple-rt.shader_test | 0 .../nested-arrays.shader_test} | 0 tests/{ => hlsl}/nointerpolation.shader_test | 0 .../normalize.shader_test} | 0 .../numeric-constructor-truncation.shader_test} | 0 .../numeric-types.shader_test} | 0 .../numthreads.shader_test} | 0 tests/{ => hlsl}/object-field-offsets.shader_test | 0 tests/{ => hlsl}/object-parameters.shader_test | 0 tests/{ => hlsl}/object-references.shader_test | 0 tests/{ => hlsl}/pow.shader_test | 0 tests/{ => hlsl}/reflect.shader_test | 0 tests/{ => hlsl}/register-reservations.shader_test | 0 .../return-implicit-conversion.shader_test} | 0 tests/{ => hlsl}/return.shader_test | 0 tests/{ => hlsl}/round.shader_test | 0 tests/{ => hlsl}/sample-bias.shader_test | 0 tests/{ => hlsl}/sample-grad.shader_test | 0 tests/{ => hlsl}/sample-level.shader_test | 0 tests/{ => hlsl}/sampler-offset.shader_test | 0 tests/{ => hlsl}/sampler.shader_test | 0 tests/{ => hlsl}/saturate.shader_test | 0 .../shader-interstage-interface.shader_test | 0 .../shape.shader_test} | 0 tests/{ => hlsl}/side-effects.shader_test | 0 tests/{ => hlsl}/sign.shader_test | 0 .../single-numeric-initializer.shader_test} | 0 .../smoothstep.shader_test} | 0 tests/{ => hlsl}/sqrt.shader_test | 0 .../state-block-syntax.shader_test} | 0 .../static-initializer.shader_test} | 0 tests/{ => hlsl}/step.shader_test | 0 .../storage-qualifiers.shader_test} | 0 .../struct-array.shader_test} | 0 .../struct-assignment.shader_test} | 0 .../struct-semantics.shader_test} | 0 tests/{ => hlsl}/swizzle-constant-prop.shader_test | 0 tests/{ => hlsl}/swizzles.shader_test | 0 .../ternary.shader_test} | 0 tests/{ => hlsl}/texture-load-offset.shader_test | 0 tests/{ => hlsl}/texture-load-typed.shader_test | 0 tests/{ => hlsl}/texture-load.shader_test | 0 .../transpose.shader_test} | 0 tests/{ => hlsl}/trigonometry.shader_test | 0 .../trunc.shader_test} | 0 .../type-names.shader_test} | 0 tests/{ => hlsl}/uav-load.shader_test | 0 tests/{ => hlsl}/uav-out-param.shader_test | 0 tests/{ => hlsl}/uav-rwbuffer.shader_test | 0 .../{ => hlsl}/uav-rwstructuredbuffer.shader_test | 0 tests/{ => hlsl}/uav-rwtexture.shader_test | 0 .../vector-indexing-uniform.shader_test} | 0 .../vector-indexing.shader_test} | 0 tests/{ => hlsl}/writemask-assignop-0.shader_test | 0 tests/{ => hlsl}/writemask-assignop-1.shader_test | 0 tests/{ => hlsl}/writemask-assignop-2.shader_test | 0 tests/{ => hlsl}/writemask-assignop-3.shader_test | 0 139 files changed, 140 insertions(+), 140 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Read and validate DXIL bitcode unabbreviated blocks.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: 6775f7ba66a1d582a72dbc212aed427f62c4013f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6775f7ba66a1d582a72dbc212aed4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 15 15:16:41 2022 +1000 vkd3d-shader/dxil: Read and validate DXIL bitcode unabbreviated blocks. --- Makefile.am | 1 + include/vkd3d_shader.h | 5 + libs/vkd3d-shader/dxbc.c | 10 +- libs/vkd3d-shader/dxil.c | 589 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/tpf.c | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 48 +++ libs/vkd3d-shader/vkd3d_shader_private.h | 15 + 7 files changed, 665 insertions(+), 4 deletions(-)

1 0

Conor McCarthy : include: Introduce a function to detect the DXBC source type.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: d3e6a3a78fc25bbdb0ea6de2b6165a1ac5628509 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d3e6a3a78fc25bbdb0ea6de2b6165… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 17 15:15:42 2023 +1000 include: Introduce a function to detect the DXBC source type. --- include/private/vkd3d_shader_utils.h | 63 ++++++++++++++++++++++++++++++++++++ libs/vkd3d/state.c | 10 ++++-- 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_shader_utils.h b/include/private/vkd3d_shader_utils.h new file mode 100644 index 00000000..00052a89 --- /dev/null +++ b/include/private/vkd3d_shader_utils.h @@ -0,0 +1,63 @@ +/* + * Copyright 2023 Conor McCarthy for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __VKD3D_SHADER_UTILS_H +#define __VKD3D_SHADER_UTILS_H + +#include "vkd3d_shader.h" + +#define TAG_DXIL VKD3D_MAKE_TAG('D', 'X', 'I', 'L') +#define TAG_SHDR VKD3D_MAKE_TAG('S', 'H', 'D', 'R') +#define TAG_SHEX VKD3D_MAKE_TAG('S', 'H', 'E', 'X') + +static inline enum vkd3d_result vkd3d_shader_parse_dxbc_source_type(const struct vkd3d_shader_code *dxbc, + enum vkd3d_shader_source_type *type, char **messages) +{ + struct vkd3d_shader_dxbc_desc desc; + enum vkd3d_result ret; + unsigned int i; + + *type = VKD3D_SHADER_SOURCE_NONE; + + if ((ret = vkd3d_shader_parse_dxbc(dxbc, 0, &desc, messages)) < 0) + return ret; + + for (i = 0; i < desc.section_count; ++i) + { + uint32_t tag = desc.sections[i].tag; + if (tag == TAG_SHDR || tag == TAG_SHEX) + { + *type = VKD3D_SHADER_SOURCE_DXBC_TPF; + } + else if (tag == TAG_DXIL) + { + *type = VKD3D_SHADER_SOURCE_DXBC_DXIL; + /* Default to DXIL if both are present. */ + break; + } + } + + vkd3d_shader_free_dxbc(&desc); + + if (*type == VKD3D_SHADER_SOURCE_NONE) + return VKD3D_ERROR_INVALID_SHADER; + + return VKD3D_OK; +} + +#endif /* __VKD3D_SHADER_UTILS_H */ diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5e46b467..2d813824 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -20,6 +20,7 @@ #include "vkd3d_private.h" #include "vkd3d_shaders.h" +#include "vkd3d_shader_utils.h" /* ID3D12RootSignature */ static inline struct d3d12_root_signature *impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) @@ -1978,14 +1979,14 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.next = shader_interface; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; - compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = options; compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; - if ((ret = vkd3d_shader_compile(&compile_info, &spirv, NULL)) < 0) + if ((ret = vkd3d_shader_parse_dxbc_source_type(&compile_info.source, &compile_info.source_type, NULL)) < 0 + || (ret = vkd3d_shader_compile(&compile_info, &spirv, NULL)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); @@ -2008,6 +2009,7 @@ static int vkd3d_scan_dxbc(const struct d3d12_device *device, const D3D12_SHADER struct vkd3d_shader_scan_descriptor_info *descriptor_info) { struct vkd3d_shader_compile_info compile_info; + enum vkd3d_result ret; const struct vkd3d_shader_compile_option options[] = { @@ -2019,13 +2021,15 @@ static int vkd3d_scan_dxbc(const struct d3d12_device *device, const D3D12_SHADER compile_info.next = descriptor_info; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; - compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = options; compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; + if ((ret = vkd3d_shader_parse_dxbc_source_type(&compile_info.source, &compile_info.source_type, NULL)) < 0) + return ret; + return vkd3d_shader_scan(&compile_info, NULL); }

1 0

Conor McCarthy : vkd3d-compiler: Introduce a dxbc-dxil source type.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: 8c7704bb7863c54f9a265a4e570a021f84301eff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8c7704bb7863c54f9a265a4e570a0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 15 15:18:26 2022 +1000 vkd3d-compiler: Introduce a dxbc-dxil source type. --- programs/vkd3d-compiler/main.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index efb3b48d..b94272a5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -30,6 +30,7 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" +#include "vkd3d_shader_utils.h" #ifdef HAVE_NCURSES #include <term.h> #endif @@ -73,6 +74,10 @@ source_type_info[] = "d3dbc", "Legacy Direct3D byte-code.\n" " This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n", true, VKD3D_SHADER_TARGET_SPIRV_BINARY}, + {VKD3D_SHADER_SOURCE_DXBC_DXIL, + "dxbc-dxil", "A 'DirectX Intermediate Language' shader embedded in a DXBC container.\n" + " This is the format used for Direct3D shader model 6 shaders.\n", + true, VKD3D_SHADER_TARGET_SPIRV_BINARY}, }; static const struct target_type_info @@ -356,6 +361,22 @@ static enum vkd3d_shader_target_type parse_target_type(const char *target) return VKD3D_SHADER_TARGET_NONE; } +static bool parse_dxbc_source_type(const struct vkd3d_shader_code *source, enum vkd3d_shader_source_type *type) +{ + char *messages; + int ret; + + if ((ret = vkd3d_shader_parse_dxbc_source_type(source, type, &messages)) < 0) + { + fprintf(stderr, "Failed to detect dxbc source type, ret %d.\n", ret); + if (messages) + fputs(messages, stderr); + vkd3d_shader_free_messages(messages); + return false; + } + return true; +} + static const struct source_type_info *get_source_type_info(enum vkd3d_shader_source_type type) { unsigned int i; @@ -671,7 +692,10 @@ int main(int argc, char **argv) { memcpy(&token, info.source.code, sizeof(token)); if (token == TAG_DXBC) - options.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + { + if (!parse_dxbc_source_type(&info.source, &options.source_type)) + return 1; + } else if ((token & 0xfffe0000) == 0xfffe0000) options.source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; else

1 0