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

Fabian Maurer : mmdevapi/tests: Add tests for IAudioSessionControl2 GetGroupingParam / SetGroupingParam.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: ae7cb868cf759362e024671c9176363959352a77 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae7cb868cf759362e024671c917636… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:03:39 2024 +0200 mmdevapi/tests: Add tests for IAudioSessionControl2 GetGroupingParam / SetGroupingParam. --- dlls/mmdevapi/tests/render.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 77028e9ef77..23ff0892dfe 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1454,6 +1454,7 @@ static void test_session(void) ULONG ref; HRESULT hr; WCHAR *str; + GUID guid1 = GUID_NULL, guid2 = GUID_NULL; hr = CoCreateGuid(&ses1_guid); ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr); @@ -1640,6 +1641,35 @@ static void test_session(void) if (str) CoTaskMemFree(str); + /* Test GetGroupingParam / SetGroupingParam */ + + hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, NULL); + todo_wine + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "GetGroupingParam failed: %08lx\n", hr); + + hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, &guid1); + todo_wine + ok(hr == S_OK, "GetGroupingParam failed: %08lx\n", hr); + todo_wine + ok(!IsEqualGUID(&guid1, &guid2), "Expected non null GUID\n"); /* MSDN is wrong here, it is not GUID_NULL */ + + hr = IAudioSessionControl2_SetGroupingParam(ses1_ctl2, NULL, NULL); + todo_wine + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetGroupingParam failed: %08lx\n", hr); + + hr = CoCreateGuid(&guid2); + ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr); + + hr = IAudioSessionControl2_SetGroupingParam(ses1_ctl2, &guid2, NULL); + todo_wine + ok(hr == S_OK, "SetGroupingParam failed: %08lx\n", hr); + + hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, &guid1); + todo_wine + ok(hr == S_OK, "GetGroupingParam failed: %08lx\n", hr); + todo_wine + ok(IsEqualGUID(&guid1, &guid2), "Got %s\n", wine_dbgstr_guid(&guid1)); + /* Test capture */ if(cap_ctl){

1 0

Fabian Maurer : mmdevapi: Implement IAudioSessionControl2 GetDisplayName / SetDisplayName.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: b23608ea7d1786ef2572ea87668ddf643716ff21 URL: https://gitlab.winehq.org/wine/wine/-/commit/b23608ea7d1786ef2572ea87668ddf… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:44:42 2024 +0200 mmdevapi: Implement IAudioSessionControl2 GetDisplayName / SetDisplayName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763 --- dlls/mmdevapi/mmdevdrv.h | 2 ++ dlls/mmdevapi/session.c | 37 ++++++++++++++++++++++++++++++++----- dlls/mmdevapi/tests/render.c | 7 ------- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index 1f4d65e4436..115c5e32fcc 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -30,6 +30,8 @@ typedef struct audio_session { float *channel_vols; BOOL mute; + WCHAR *display_name; + struct list entry; } AudioSession; diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index 9a36adb5bf2..d4948e3b141 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -37,6 +37,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern void sessions_lock(void); extern void sessions_unlock(void); +static WCHAR *duplicate_wstr(const WCHAR *str) +{ + const WCHAR *source = str ? str : L""; + int len = (wcslen(source) + 1) * sizeof(WCHAR); + WCHAR *ret = CoTaskMemAlloc(len); + memcpy(ret, source, len); + return ret; +} + extern void set_stream_volumes(struct audio_client *This); static struct list sessions = LIST_INIT(sessions); @@ -144,16 +153,34 @@ static HRESULT WINAPI control_GetState(IAudioSessionControl2 *iface, AudioSessio static HRESULT WINAPI control_GetDisplayName(IAudioSessionControl2 *iface, WCHAR **name) { struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface); - FIXME("(%p)->(%p) - stub\n", This, name); - return E_NOTIMPL; + struct audio_session *session = This->session; + + TRACE("(%p)->(%p) - stub\n", This, name); + + if (!name) + return E_POINTER; + + *name = duplicate_wstr(session->display_name); + + return S_OK; } static HRESULT WINAPI control_SetDisplayName(IAudioSessionControl2 *iface, const WCHAR *name, - const GUID *session) + const GUID *event_context) { struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface); - FIXME("(%p)->(%p, %s) - stub\n", This, name, debugstr_guid(session)); - return E_NOTIMPL; + struct audio_session *session = This->session; + + TRACE("(%p)->(%p, %s) - stub\n", This, name, debugstr_guid(event_context)); + FIXME("Ignoring event_context\n"); + + if (!name) + return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + + free(session->display_name); + session->display_name = wcsdup(name); + + return S_OK; } static HRESULT WINAPI control_GetIconPath(IAudioSessionControl2 *iface, WCHAR **path) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 23ff0892dfe..6d76bff8b22 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1580,31 +1580,24 @@ static void test_session(void) /* Test GetDisplayName / SetDisplayName */ hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, NULL); - todo_wine ok(hr == E_POINTER, "GetDisplayName failed: %08lx\n", hr); str = NULL; hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, &str); - todo_wine ok(hr == S_OK, "GetDisplayName failed: %08lx\n", hr); - todo_wine ok(str && !wcscmp(str, L""), "Got %s\n", wine_dbgstr_w(str)); if (str) CoTaskMemFree(str); hr = IAudioSessionControl2_SetDisplayName(ses1_ctl2, NULL, NULL); - todo_wine ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetDisplayName failed: %08lx\n", hr); hr = IAudioSessionControl2_SetDisplayName(ses1_ctl2, L"WineDisplayName", NULL); - todo_wine ok(hr == S_OK, "SetDisplayName failed: %08lx\n", hr); str = NULL; hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, &str); - todo_wine ok(hr == S_OK, "GetDisplayName failed: %08lx\n", hr); - todo_wine ok(str && !wcscmp(str, L"WineDisplayName"), "Got %s\n", wine_dbgstr_w(str)); if (str) CoTaskMemFree(str);

1 0

Stefan Dösinger : include: Get rid of the RB_FOR_EACH* macros.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: vkd3d Branch: master Commit: 021eb28584925409a70f5690177e7fb435079355 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/021eb28584925409a70f5690177e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 22 15:00:50 2024 +0300 include: Get rid of the RB_FOR_EACH* macros. They're largely unused, and RB_FOR_EACH_ENTRY_DESTRUCTOR is broken because it uses WINE_RB_ENTRY_VALUE which doesn't exist in vkd3d. --- include/private/rbtree.h | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/include/private/rbtree.h b/include/private/rbtree.h index b5d38bca..f40a4257 100644 --- a/include/private/rbtree.h +++ b/include/private/rbtree.h @@ -126,34 +126,17 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter) return rb_postorder_head(iter->parent->right); } -/* iterate through the tree */ -#define RB_FOR_EACH(cursor, tree) \ - for ((cursor) = rb_head((tree)->root); (cursor); (cursor) = rb_next(cursor)) - -/* iterate through the tree using a tree entry */ -#define RB_FOR_EACH_ENTRY(elem, tree, type, field) \ - for ((elem) = RB_ENTRY_VALUE(rb_head((tree)->root), type, field); \ - (elem) != RB_ENTRY_VALUE(0, type, field); \ - (elem) = RB_ENTRY_VALUE(rb_next(&elem->field), type, field)) - -/* iterate through the tree using using postorder, making it safe to free the entry */ -#define RB_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \ - for ((cursor) = rb_postorder_head((tree)->root); \ - (cursor) && (((cursor2) = rb_postorder_next(cursor)) || 1); \ - (cursor) = (cursor2)) - -/* iterate through the tree using a tree entry and postorder, making it safe to free the entry */ -#define RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ - for ((elem) = RB_ENTRY_VALUE(rb_postorder_head((tree)->root), type, field); \ - (elem) != WINE_RB_ENTRY_VALUE(0, type, field) \ - && (((elem2) = RB_ENTRY_VALUE(rb_postorder_next(&(elem)->field), type, field)) || 1); \ - (elem) = (elem2)) - - static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context) { - struct rb_entry *iter, *next; - RB_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); + struct rb_entry *entry = rb_postorder_head(tree->root); + struct rb_entry *next; + + while (entry) + { + next = rb_postorder_next(entry); + callback(entry, context); + entry = next; + } } static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) @@ -164,8 +147,13 @@ static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context) { - struct rb_entry *iter; - RB_FOR_EACH(iter, tree) callback(iter, context); + struct rb_entry *entry = rb_head(tree->root); + + while (entry) + { + callback(entry, context); + entry = rb_next(entry); + } } static inline void rb_clear(struct rb_tree *tree, rb_traverse_func *callback, void *context)

1 0

Elizabeth Figura : tests: Stop probing all pixels when drawing a uniform colour.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: vkd3d Branch: master Commit: d3ba810c98b4d2df260a527f74586a0b31408510 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d3ba810c98b4d2df260a527f74586… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Feb 10 13:16:22 2024 -0600 tests: Stop probing all pixels when drawing a uniform colour. This is simply unnecessary and wastes time. As part of this, simply remove the "all" directive. Only for a couple of tests is it even potentially interesting to validate all pixels (e.g. nointerpolation.shader_test), and for those "all" is replaced with an explicit (0, 0, 640, 480) rect. In all other cases we just probe (0, 0). --- tests/hlsl/abs.shader_test | 4 +- tests/hlsl/all.shader_test | 14 ++--- tests/hlsl/angle-unit.shader_test | 4 +- tests/hlsl/any.shader_test | 36 ++++++------ tests/hlsl/arithmetic-float-uniform.shader_test | 26 ++++----- tests/hlsl/arithmetic-float.shader_test | 12 ++-- tests/hlsl/arithmetic-int-uniform.shader_test | 26 ++++----- tests/hlsl/arithmetic-int.shader_test | 22 ++++---- tests/hlsl/arithmetic-uint.shader_test | 8 +-- tests/hlsl/array-dimension.shader_test | 2 +- tests/hlsl/array-parameters.shader_test | 8 +-- tests/hlsl/array-size-expr.shader_test | 10 ++-- tests/hlsl/bitwise.shader_test | 48 ++++++++-------- tests/hlsl/bool-cast.shader_test | 6 +- tests/hlsl/bool-semantics.shader_test | 2 +- tests/hlsl/calculate-lod.shader_test | 8 +-- tests/hlsl/cast-64-bit.shader_test | 12 ++-- tests/hlsl/cast-broadcast.shader_test | 4 +- .../hlsl/cast-componentwise-compatible.shader_test | 46 +++++++-------- tests/hlsl/cast-componentwise-equal.shader_test | 10 ++-- tests/hlsl/cast-to-float.shader_test | 4 +- tests/hlsl/cast-to-half.shader_test | 4 +- tests/hlsl/cast-to-int.shader_test | 8 +-- tests/hlsl/cast-to-uint.shader_test | 4 +- tests/hlsl/cbuffer.shader_test | 38 ++++++------- tests/hlsl/ceil.shader_test | 8 +-- tests/hlsl/cf-cond-types.shader_test | 4 +- tests/hlsl/clamp.shader_test | 4 +- tests/hlsl/clip-distance.shader_test | 6 +- tests/hlsl/clip.shader_test | 12 ++-- tests/hlsl/combined-samplers.shader_test | 14 ++--- tests/hlsl/comma.shader_test | 2 +- tests/hlsl/conditional.shader_test | 40 ++++++------- tests/hlsl/const.shader_test | 2 +- tests/hlsl/coverage.shader_test | 24 ++++---- tests/hlsl/cross.shader_test | 4 +- tests/hlsl/d3dcolor-to-ubyte4.shader_test | 4 +- tests/hlsl/ddxddy.shader_test | 2 +- tests/hlsl/default-values.shader_test | 18 +++--- tests/hlsl/depth-out.shader_test | 28 ++++----- tests/hlsl/determinant.shader_test | 14 ++--- tests/hlsl/discard.shader_test | 8 +-- tests/hlsl/distance.shader_test | 2 +- tests/hlsl/dot.shader_test | 12 ++-- tests/hlsl/duplicate-modifiers.shader_test | 4 +- tests/hlsl/exp.shader_test | 4 +- tests/hlsl/expr-indexing.shader_test | 14 ++--- tests/hlsl/float-comparison.shader_test | 16 +++--- tests/hlsl/floor.shader_test | 8 +-- tests/hlsl/fmod.shader_test | 8 +-- tests/hlsl/for.shader_test | 2 +- tests/hlsl/frac.shader_test | 2 +- tests/hlsl/function-cast.shader_test | 8 +-- tests/hlsl/function-overload.shader_test | 4 +- tests/hlsl/function-return.shader_test | 38 ++++++------- tests/hlsl/function.shader_test | 16 +++--- tests/hlsl/gather-offset.shader_test | 14 ++--- tests/hlsl/gather.shader_test | 14 ++--- tests/hlsl/get-sample-pos.shader_test | 2 +- tests/hlsl/getdimensions.shader_test | 4 +- tests/hlsl/half.shader_test | 2 +- tests/hlsl/hard-copy-prop.shader_test | 12 ++-- tests/hlsl/initializer-flatten.shader_test | 10 ++-- tests/hlsl/initializer-implicit-array.shader_test | 8 +-- .../hlsl/initializer-invalid-arg-count.shader_test | 4 +- tests/hlsl/initializer-local-array.shader_test | 4 +- tests/hlsl/initializer-matrix.shader_test | 12 ++-- tests/hlsl/initializer-multi.shader_test | 6 +- tests/hlsl/initializer-nested.shader_test | 6 +- tests/hlsl/initializer-numeric.shader_test | 14 ++--- tests/hlsl/initializer-objects.shader_test | 4 +- tests/hlsl/initializer-static-array.shader_test | 4 +- tests/hlsl/initializer-struct.shader_test | 6 +- tests/hlsl/intrinsic-override.shader_test | 6 +- tests/hlsl/inverse-trig.shader_test | 66 +++++++++++----------- tests/hlsl/is-front-face.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 6 +- tests/hlsl/length.shader_test | 10 ++-- tests/hlsl/lerp.shader_test | 6 +- tests/hlsl/lit.shader_test | 8 +-- tests/hlsl/load-level.shader_test | 6 +- tests/hlsl/log.shader_test | 6 +- tests/hlsl/logic-operations.shader_test | 28 ++++----- tests/hlsl/loop.shader_test | 14 ++--- tests/hlsl/majority-pragma.shader_test | 32 +++++------ tests/hlsl/majority-syntax.shader_test | 2 +- tests/hlsl/majority-typedef.shader_test | 2 +- tests/hlsl/math.shader_test | 2 +- tests/hlsl/matrix-indexing.shader_test | 18 +++--- tests/hlsl/matrix-semantics.shader_test | 34 +++++------ tests/hlsl/max-min.shader_test | 14 ++--- tests/hlsl/minimum-precision.shader_test | 10 ++-- tests/hlsl/mul.shader_test | 40 ++++++------- tests/hlsl/multiple-rt.shader_test | 4 +- tests/hlsl/nested-arrays.shader_test | 2 +- tests/hlsl/nointerpolation.shader_test | 10 ++-- tests/hlsl/non-const-indexing.shader_test | 52 ++++++++--------- tests/hlsl/normalize.shader_test | 10 ++-- .../numeric-constructor-truncation.shader_test | 4 +- tests/hlsl/numeric-types.shader_test | 10 ++-- tests/hlsl/object-field-offsets.shader_test | 6 +- tests/hlsl/object-parameters.shader_test | 6 +- tests/hlsl/object-references.shader_test | 6 +- tests/hlsl/pointer-cast.shader_test | 4 +- tests/hlsl/pow.shader_test | 4 +- tests/hlsl/precise-modifier.shader_test | 6 +- tests/hlsl/rasteriser-ordered-views.shader_test | 8 +-- tests/hlsl/reflect.shader_test | 12 ++-- tests/hlsl/refract.shader_test | 32 +++++------ .../hlsl/register-reservations-numeric.shader_test | 20 +++---- .../hlsl/register-reservations-profile.shader_test | 32 +++++------ .../register-reservations-resources.shader_test | 24 ++++---- tests/hlsl/register-reservations-space.shader_test | 20 +++---- tests/hlsl/return-implicit-conversion.shader_test | 28 ++++----- tests/hlsl/return.shader_test | 50 ++++++++-------- tests/hlsl/round.shader_test | 6 +- tests/hlsl/rt-get-sample-info.shader_test | 6 +- tests/hlsl/sample-bias.shader_test | 12 ++-- tests/hlsl/sample-cmp.shader_test | 20 +++---- tests/hlsl/sample-grad.shader_test | 6 +- tests/hlsl/sample-level.shader_test | 12 ++-- tests/hlsl/sampler-offset.shader_test | 6 +- tests/hlsl/sampler.shader_test | 4 +- tests/hlsl/saturate.shader_test | 4 +- tests/hlsl/shader-interstage-interface.shader_test | 2 +- tests/hlsl/shape.shader_test | 54 +++++++++--------- tests/hlsl/side-effects.shader_test | 6 +- tests/hlsl/sign.shader_test | 20 +++---- tests/hlsl/single-numeric-initializer.shader_test | 4 +- tests/hlsl/sm1-const-allocation.shader_test | 30 +++++----- tests/hlsl/sm1-const-folding.shader_test | 28 ++++----- tests/hlsl/sm6-ternary.shader_test | 6 +- tests/hlsl/smoothstep.shader_test | 18 +++--- tests/hlsl/sqrt.shader_test | 4 +- tests/hlsl/srv-buffers.shader_test | 16 +++--- tests/hlsl/state-block-syntax.shader_test | 2 +- tests/hlsl/static-initializer.shader_test | 8 +-- tests/hlsl/step.shader_test | 6 +- tests/hlsl/storage-qualifiers.shader_test | 4 +- tests/hlsl/struct-array.shader_test | 2 +- tests/hlsl/struct-assignment.shader_test | 2 +- tests/hlsl/struct-semantics.shader_test | 2 +- tests/hlsl/switch.shader_test | 64 ++++++++++----------- tests/hlsl/swizzle-constant-prop.shader_test | 6 +- tests/hlsl/swizzle-matrix.shader_test | 14 ++--- tests/hlsl/swizzles.shader_test | 24 ++++---- tests/hlsl/ternary.shader_test | 30 +++++----- tests/hlsl/tessellation.shader_test | 2 +- tests/hlsl/texture-load-typed.shader_test | 4 +- tests/hlsl/texture-ordering.shader_test | 10 ++-- tests/hlsl/transpose.shader_test | 10 ++-- tests/hlsl/trigonometry.shader_test | 18 +++--- tests/hlsl/trunc.shader_test | 8 +-- tests/hlsl/type-names.shader_test | 2 +- tests/hlsl/uniform-semantics.shader_test | 4 +- tests/hlsl/vector-indexing-uniform.shader_test | 2 +- tests/hlsl/vector-indexing.shader_test | 6 +- tests/hlsl/vertex-shader-ops.shader_test | 14 ++--- tests/hlsl/writemask-assignop-0.shader_test | 2 +- tests/hlsl/writemask-assignop-1.shader_test | 2 +- tests/hlsl/writemask-assignop-2.shader_test | 2 +- tests/hlsl/writemask-assignop-3.shader_test | 2 +- tests/shader_runner.c | 6 +- 163 files changed, 1003 insertions(+), 1007 deletions(-)

1 0

Giovanni Mascellani : vkd3d: Do not request VK_EXT_debug_marker if debug is disabled.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: vkd3d Branch: master Commit: 3254eff3282ff06776aead60d2182dcd74247861 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3254eff3282ff06776aead60d2182… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 3 23:33:16 2024 +0200 vkd3d: Do not request VK_EXT_debug_marker if debug is disabled. Because it requires VK_EXT_debug_report. --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c27a96e2..5352fe38 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -92,7 +92,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(EXT_4444_FORMATS, EXT_4444_formats), VK_EXTENSION(EXT_CALIBRATED_TIMESTAMPS, EXT_calibrated_timestamps), VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), - VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), + VK_DEBUG_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable), VK_EXTENSION(EXT_DESCRIPTOR_INDEXING, EXT_descriptor_indexing), VK_EXTENSION(EXT_FRAGMENT_SHADER_INTERLOCK, EXT_fragment_shader_interlock),

1 0

Giovanni Mascellani : vkd3d: Enable VK_KHR_portability_subset if available.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: vkd3d Branch: master Commit: a1a07de8caf8e45d7a0f79e494ced5d9a5afc224 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1a07de8caf8e45d7a0f79e494ced… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 3 23:39:43 2024 +0200 vkd3d: Enable VK_KHR_portability_subset if available. We don't check it, but at least the validation layer does not complain when using MoltenVK. --- libs/vkd3d/device.c | 9 +++++++++ libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 10 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5352fe38..45a24b0f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -76,6 +76,14 @@ static const char * const required_device_extensions[] = VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, }; +/* In general we don't want to enable Vulkan beta extensions, but make an + * exception for VK_KHR_portability_subset because we draw no real feature from + * it, but it's still useful to be able to develop for MoltenVK without being + * spammed with validation errors. */ +#ifndef VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME +#define VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME "VK_KHR_portability_subset" +#endif + static const struct vkd3d_optional_extension_info optional_device_extensions[] = { /* KHR extensions */ @@ -85,6 +93,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_IMAGE_FORMAT_LIST, KHR_image_format_list), VK_EXTENSION(KHR_MAINTENANCE2, KHR_maintenance2), VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), + VK_EXTENSION(KHR_PORTABILITY_SUBSET, KHR_portability_subset), VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), VK_EXTENSION(KHR_TIMELINE_SEMAPHORE, KHR_timeline_semaphore), diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 84bdee92..09bbc29a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -123,6 +123,7 @@ struct vkd3d_vulkan_info bool KHR_image_format_list; bool KHR_maintenance2; bool KHR_maintenance3; + bool KHR_portability_subset; bool KHR_push_descriptor; bool KHR_sampler_mirror_clamp_to_edge; bool KHR_timeline_semaphore;

1 0

Giovanni Mascellani : vkd3d: Do not synchronize with the geometry shader stage if it's not enabled.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: vkd3d Branch: master Commit: a54187f3c9c9ad4a5d1357721104f28c498ac112 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a54187f3c9c9ad4a5d1357721104f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 3 23:55:03 2024 +0200 vkd3d: Do not synchronize with the geometry shader stage if it's not enabled. --- libs/vkd3d/command.c | 20 +++++++++++++------- libs/vkd3d/device.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 6e37209c..06721aec 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2025,7 +2025,8 @@ static void d3d12_command_list_invalidate_root_parameters(struct d3d12_command_l static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, unsigned int stencil_state, const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, const struct vkd3d_vulkan_info *vk_info, - VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) + VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout, + struct d3d12_device *device) { bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION); VkPipelineStageFlags queue_shader_stages = 0; @@ -2035,8 +2036,9 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, queue_shader_stages |= VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT | VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT - | VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + if (device->vk_info.geometry_shaders) + queue_shader_stages |= VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT; } if (vk_queue_flags & VK_QUEUE_COMPUTE_BIT) queue_shader_stages |= VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT; @@ -2054,7 +2056,7 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, { if (resource->present_state != D3D12_RESOURCE_STATE_PRESENT) return vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0, - resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); + resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout, device); *access_mask = VK_ACCESS_MEMORY_READ_BIT; *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; @@ -2251,7 +2253,8 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, 0, - resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) + resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, + &dst_stage_mask, &barrier.newLayout, list->device)) { FIXME("Unhandled state %#x.\n", resource->initial_state); return; @@ -4277,13 +4280,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } if (!vk_barrier_parameters_from_d3d12_resource_state(state_before, stencil_state_before, - resource, list->vk_queue_flags, vk_info, &src_access_mask, &src_stage_mask, &layout_before)) + resource, list->vk_queue_flags, vk_info, &src_access_mask, + &src_stage_mask, &layout_before, list->device)) { FIXME("Unhandled state %#x.\n", state_before); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(state_after, stencil_state_after, - resource, list->vk_queue_flags, vk_info, &dst_access_mask, &dst_stage_mask, &layout_after)) + resource, list->vk_queue_flags, vk_info, &dst_access_mask, + &dst_stage_mask, &layout_after, list->device)) { FIXME("Unhandled state %#x.\n", state_after); continue; @@ -4303,7 +4308,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, - resource, list->vk_queue_flags, vk_info, &access_mask, &stage_mask, &image_layout); + resource, list->vk_queue_flags, vk_info, &access_mask, + &stage_mask, &image_layout, list->device); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; layout_before = layout_after = image_layout; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 45a24b0f..674e46fe 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1643,6 +1643,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->device_limits = physical_device_info->properties2.properties.limits; vulkan_info->sparse_properties = physical_device_info->properties2.properties.sparseProperties; + vulkan_info->geometry_shaders = physical_device_info->features2.features.geometryShader; vulkan_info->sparse_binding = features->sparseBinding; vulkan_info->sparse_residency_3d = features->sparseResidencyImage3D; vulkan_info->rasterization_stream = physical_device_info->xfb_properties.transformFeedbackRasterizationStreamSelect; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 09bbc29a..226b71fe 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -146,6 +146,7 @@ struct vkd3d_vulkan_info bool rasterization_stream; bool transform_feedback_queries; + bool geometry_shaders; bool uav_read_without_format;

1 0

Henri Verbeet : vkd3d: Always use UINT views to clear UAVs with integer formats.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: vkd3d Branch: master Commit: 90f26759b51abaa5adff14c92f9d4063905a6c15 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/90f26759b51abaa5adff14c92f9d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 17:14:57 2024 +0200 vkd3d: Always use UINT views to clear UAVs with integer formats. We would previously try to use float pipelines for SINT formats. --- libs/vkd3d/command.c | 108 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 06721aec..6c463be8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5434,6 +5434,52 @@ static const struct vkd3d_format *vkd3d_fixup_clear_uav_uint_colour(struct d3d12 } } +static struct vkd3d_view *create_uint_view(struct d3d12_device *device, const struct vkd3d_resource_view *view, + struct d3d12_resource *resource, VkClearColorValue *colour) +{ + struct vkd3d_texture_view_desc view_desc; + const struct vkd3d_format *uint_format; + struct vkd3d_view *uint_view; + + if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format)) + && !(uint_format = vkd3d_fixup_clear_uav_uint_colour(device, view->format->dxgi_format, colour))) + { + ERR("Unhandled format %#x.\n", view->format->dxgi_format); + return NULL; + } + + if (d3d12_resource_is_buffer(resource)) + { + if (!vkd3d_create_buffer_view(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource->u.vk_buffer, + uint_format, view->info.buffer.offset, view->info.buffer.size, &uint_view)) + { + ERR("Failed to create buffer view.\n"); + return NULL; + } + + return uint_view; + } + + memset(&view_desc, 0, sizeof(view_desc)); + view_desc.view_type = view->info.texture.vk_view_type; + view_desc.format = uint_format; + view_desc.miplevel_idx = view->info.texture.miplevel_idx; + view_desc.miplevel_count = 1; + view_desc.layer_idx = view->info.texture.layer_idx; + view_desc.layer_count = view->info.texture.layer_count; + view_desc.vk_image_aspect = VK_IMAGE_ASPECT_COLOR_BIT; + view_desc.usage = VK_IMAGE_USAGE_STORAGE_BIT; + + if (!vkd3d_create_texture_view(device, VKD3D_DESCRIPTOR_MAGIC_UAV, + resource->u.vk_image, &view_desc, &uint_view)) + { + ERR("Failed to create image view.\n"); + return NULL; + } + + return uint_view; +} + static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList5 *iface, D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource, const UINT values[4], UINT rect_count, const D3D12_RECT *rects) @@ -5441,8 +5487,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList5(iface); struct vkd3d_view *descriptor, *uint_view = NULL; struct d3d12_device *device = list->device; - struct vkd3d_texture_view_desc view_desc; - const struct vkd3d_format *uint_format; const struct vkd3d_resource_view *view; struct d3d12_resource *resource_impl; VkClearColorValue colour; @@ -5456,44 +5500,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID view = &descriptor->v; memcpy(colour.uint32, values, sizeof(colour.uint32)); - if (view->format->type != VKD3D_FORMAT_TYPE_UINT) + if (view->format->type != VKD3D_FORMAT_TYPE_UINT + && !(descriptor = uint_view = create_uint_view(device, view, resource_impl, &colour))) { - if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format)) - && !(uint_format = vkd3d_fixup_clear_uav_uint_colour(device, view->format->dxgi_format, &colour))) - { - ERR("Unhandled format %#x.\n", view->format->dxgi_format); - return; - } - - if (d3d12_resource_is_buffer(resource_impl)) - { - if (!vkd3d_create_buffer_view(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource_impl->u.vk_buffer, - uint_format, view->info.buffer.offset, view->info.buffer.size, &uint_view)) - { - ERR("Failed to create buffer view.\n"); - return; - } - } - else - { - memset(&view_desc, 0, sizeof(view_desc)); - view_desc.view_type = view->info.texture.vk_view_type; - view_desc.format = uint_format; - view_desc.miplevel_idx = view->info.texture.miplevel_idx; - view_desc.miplevel_count = 1; - view_desc.layer_idx = view->info.texture.layer_idx; - view_desc.layer_count = view->info.texture.layer_count; - view_desc.vk_image_aspect = VK_IMAGE_ASPECT_COLOR_BIT; - view_desc.usage = VK_IMAGE_USAGE_STORAGE_BIT; - - if (!vkd3d_create_texture_view(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource_impl->u.vk_image, &view_desc, - &uint_view)) - { - ERR("Failed to create image view.\n"); - return; - } - } - descriptor = uint_view; + ERR("Failed to create UINT view.\n"); + return; } d3d12_command_list_clear_uav(list, resource_impl, descriptor, &colour, rect_count, rects); @@ -5507,19 +5518,32 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I const float values[4], UINT rect_count, const D3D12_RECT *rects) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList5(iface); + struct vkd3d_view *descriptor, *uint_view = NULL; + struct d3d12_device *device = list->device; + const struct vkd3d_resource_view *view; struct d3d12_resource *resource_impl; VkClearColorValue colour; - struct vkd3d_view *view; TRACE("iface %p, gpu_handle %s, cpu_handle %s, resource %p, values %p, rect_count %u, rects %p.\n", iface, debug_gpu_handle(gpu_handle), debug_cpu_handle(cpu_handle), resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); - if (!(view = d3d12_desc_from_cpu_handle(cpu_handle)->s.u.view)) + if (!(descriptor = d3d12_desc_from_cpu_handle(cpu_handle)->s.u.view)) return; + view = &descriptor->v; memcpy(colour.float32, values, sizeof(colour.float32)); - d3d12_command_list_clear_uav(list, resource_impl, view, &colour, rect_count, rects); + if (view->format->type == VKD3D_FORMAT_TYPE_SINT + && !(descriptor = uint_view = create_uint_view(device, view, resource_impl, &colour))) + { + ERR("Failed to create UINT view.\n"); + return; + } + + d3d12_command_list_clear_uav(list, resource_impl, descriptor, &colour, rect_count, rects); + + if (uint_view) + vkd3d_view_decref(uint_view, device); } static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList5 *iface,

1 0

Giovanni Mascellani : tests: Mark some root signature unbounded range failures as todo on MoltenVK.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: vkd3d Branch: master Commit: 3ad4d984ad8a228d2081d87f01ffe7854163812b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3ad4d984ad8a228d2081d87f01ffe… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 3 23:18:47 2024 +0200 tests: Mark some root signature unbounded range failures as todo on MoltenVK. --- tests/d3d12.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a4b20696..fcdf844d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2985,7 +2985,13 @@ static void test_create_root_signature(void) descriptor_ranges[1].RegisterSpace = 0; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 16; hr = create_root_signature(device, &root_signature_desc, &root_signature); + /* This and similar tests later currently fail with E_FAIL when + * VK_EXT_descriptor_indexing is not available. This check happens before + * detecting the overlap that would trigger E_INVALIDARG. We still check + * that we're seeing a failure. */ + todo_if(binding_tier <= D3D12_RESOURCE_BINDING_TIER_2) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); /* A bounded range overlapping an unbounded one, mapped to the same * register space, but a different type. */ @@ -3004,7 +3010,9 @@ static void test_create_root_signature(void) descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; descriptor_ranges[1].NumDescriptors = UINT_MAX; hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo_if(binding_tier <= D3D12_RESOURCE_BINDING_TIER_2) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); /* And unbounded range overlapping a bounded one, mapped to the same * register space and type. */ @@ -3012,7 +3020,9 @@ static void test_create_root_signature(void) descriptor_ranges[1].BaseShaderRegister = 0; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 15; hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo_if(binding_tier <= D3D12_RESOURCE_BINDING_TIER_2) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);

1 0

Eric Pouech : quartz/tests: Add new tests about fullscreen handling.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: faa5cade4a0db7a0a9af1896942dc4a8f8b3e238 URL: https://gitlab.winehq.org/wine/wine/-/commit/faa5cade4a0db7a0a9af1896942dc4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 09:14:50 2024 +0200 quartz/tests: Add new tests about fullscreen handling. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 8 ++++++++ dlls/quartz/tests/vmr7.c | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c3dcfb803c2..4039939f0d9 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2966,6 +2966,14 @@ static void test_control_delegation(void) hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + val = 0xdeadbeef; + hr = IVideoWindow_get_FullScreenMode(window, &val); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(val == OAFALSE, "Got fullscreen %lu\n", val); + + hr = IVideoWindow_put_FullScreenMode(window, OAFALSE); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + hr = IFilterGraph2_RemoveFilter(graph, renderer); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 028f14838c3..b7f36134bcd 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2466,6 +2466,18 @@ static void test_video_window(void) hr = IVideoWindow_GetMaxIdealImageSize(window, &width, &height); todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#lx.\n", hr); + IVideoWindow_Release(window); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + l = 0xdeadbeef; + hr = IVideoWindow_get_FullScreenMode(window, &l); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(l == OAFALSE, "Got fullscreenmode %ld.\n", l); + hr = IVideoWindow_put_FullScreenMode(window, l); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + IFilterGraph2_Release(graph); IVideoWindow_Release(window); IOverlay_Release(overlay);

1 0