October 2023 - Wine-gitlab - list.winehq.org

Re: [PATCH v2 0/1] MR392: vkd3d-shader/tpf: Get rid of the output map. - approved
by Alexandre Julliard (＠julliard) 09 Oct '23

09 Oct '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/392

1 0

Re: [PATCH v2 0/1] MR391: vkd3d-shader/hlsl: Get rid of the vkd3d_sm4_* forward declarations in hlsl.h. - approved
by Alexandre Julliard (＠julliard) 09 Oct '23

09 Oct '23

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/391

1 0

[PATCH 0/1] MR4053: include: Avoid narrowing warning in wine_dbgstr_fourcc.
by Rémi Bernon 09 Oct '23

09 Oct '23

This otherwise causes a warning when compiling C++ with "wine/debug.h" included. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4053

2 2

[PATCH v2 0/6] MR4042: windows.security.credentials.ui.userconsentverifier: Implement IUserConsentVerifierStatics::CheckAvailabilityAsync().
by Mohamad Al-Jaf (＠maljaf) 09 Oct '23

09 Oct '23

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55709 There appears to be a race condition happening. When it doesn't work, it looks like the apartment is not initialized, output: ``` 01e8:fixme:combase:RoGetActivationFactory (L"Windows.Security.Credentials.UI.UserConsentVerifier", {af4f3f91-564c-4ddc-b8b5-973447627c65}, 000000000011E890): semi-stub 01e8:fixme:credentials:factory_QueryInterface {94ea2b94-e9cc-49e0-c0ff-ee64ca8f5b90} not implemented, returning E_NOINTERFACE. 0220:err:ole:CoGetContextToken apartment not initialised 0220:fixme:ole:thread_context_callback_ContextCallback 000000000347E4A8, 00007FFFFE10D510, 0000000005C7FBA0, {0a299774-3e4e-fc42-1d9d-72cee105ca57}, 5, 0000000000000000 0220:fixme:combase:RoOriginateLanguageException 0x80004001, L"", 0000000000000000: stub wine: Call from 0000000174013C17 to unimplemented function combase.dll.RoFailFastWithErrorContext, aborting wine: Unimplemented function combase.dll.RoFailFastWithErrorContext called at address 0000000174013C17 (thread 0220), starting debugger. ``` Adding in WINEDEBUG=+credentials makes it consistently work: ``` 0154:fixme:combase:RoGetActivationFactory (L"Windows.Security.Credentials.UI.UserConsentVerifier", {af4f3f91-564c-4ddc-b8b5-973447627c65}, 000000000011E890): semi-stub 0154:trace:credentials:DllGetActivationFactory class L"Windows.Security.Credentials.UI.UserConsentVerifier", factory 000000000011E6C0. 0154:trace:credentials:factory_QueryInterface iface 00000001F3B04040, iid {00000035-0000-0000-c000-000000000046}, out 000000000011E6C0. 0154:trace:credentials:factory_AddRef iface 00000001F3B04040 increasing refcount to 2. 0154:trace:credentials:factory_QueryInterface iface 00000001F3B04040, iid {af4f3f91-564c-4ddc-b8b5-973447627c65}, out 000000000011E890. 0154:trace:credentials:factory_AddRef iface 00000001F3B04040 increasing refcount to 3. 0154:trace:credentials:factory_Release iface 00000001F3B04040 decreasing refcount to 2. 0154:trace:credentials:factory_QueryInterface iface 00000001F3B04040, iid {94ea2b94-e9cc-49e0-c0ff-ee64ca8f5b90}, out 000000000011E898. 0154:fixme:credentials:factory_QueryInterface {94ea2b94-e9cc-49e0-c0ff-ee64ca8f5b90} not implemented, returning E_NOINTERFACE. 0154:trace:credentials:user_consent_verifier_statics_CheckAvailabilityAsync iface 00000001F3B04048, result 000000000011E868 0154:trace:credentials:factory_AddRef iface 00000001F3B04040 increasing refcount to 3. 0154:trace:credentials:async_impl_Start iface 0000000000791260. 0154:trace:credentials:async_UserConsentVerifierAvailability_AddRef iface 0000000003461650, ref 2. 0154:trace:credentials:async_operation_UserConsentVerifierAvailability_create created IAsyncOperation_UserConsentVerifierAvailability 0000000003461650 0154:trace:credentials:factory_Release iface 00000001F3B04040 decreasing refcount to 2. 0154:trace:credentials:async_UserConsentVerifierAvailability_AddRef iface 0000000003461650, ref 3. 0154:trace:credentials:async_UserConsentVerifierAvailability_put_Completed iface 0000000003461650, handler 00000000033E2410. 0154:trace:credentials:async_impl_put_Completed iface 0000000000791260, handler 00000000033E2410. 0154:trace:credentials:async_UserConsentVerifierAvailability_GetResults iface 0000000003461650, results 000000000011E790. 0154:trace:credentials:async_impl_get_Result iface 0000000000791260, result 000000000011E700. 018c:trace:credentials:async_UserConsentVerifierAvailability_Release iface 0000000003461650, ref 2. 0154:trace:credentials:async_UserConsentVerifierAvailability_Release iface 0000000003461650, ref 1. 0154:trace:credentials:async_UserConsentVerifierAvailability_Release iface 0000000003461650, ref 0. 0154:trace:credentials:async_impl_Release iface 0000000000791260, ref 0. 0154:trace:credentials:async_info_Close iface 0000000000791268. 0154:trace:credentials:factory_Release iface 00000001F3B04040 decreasing refcount to 1. ``` -- v2: windows.security.credentials.ui.userconsentverifier/tests: Add IUserConsentVerifierStatics::CheckAvailabilityAsync() tests. windows.security.credentials.ui.userconsentverifier: Implement IUserConsentVerifierStatics::CheckAvailabilityAsync(). windows.security.credentials.ui.userconsentverifier: Import and modify IAsyncOperation from windows.gaming.input. https://gitlab.winehq.org/wine/wine/-/merge_requests/4042

4 8

[PATCH v2 0/4] MR394: vkd3d-shader: sm1 texture interface.
by Zebediah Figura (＠zfigura) 09 Oct '23

09 Oct '23

This defines (and, broadly, implements) the API for mapping sm1 combined samplers to the target environment. This is possibly the simplest bit of API for sm1 support thus far. It does not actually involve any API changes. Rather, each combined sampler is split into two descriptors, one for the sampler and one for the texture, both with the same binding index as the original combined sampler. -- I feel rather positive about this bit of API. it required very little design concern or implementation difficulty on the vkd3d side. On the Wine side, it required quite a lot of change, but I think pretty much all of that change was positive on its own merits, and should probably be applied independently of the sm1/Vulkan work. We've talked about translating wined3d_device_set_sampler_state() and wined3d_device_set_texture() to wined3d_device_set_sampler() and wined3d_device_set_shader_resource_view() for quite some time now, and that was pretty much exactly what was required to make this work—that and choosing the obvious mapping of "same index for both state objects". The most obvious alternative to this design, to me, would be to reroll struct vkd3d_shader_interface_info (or extend it without rerolling), adding a new array for mapping a combined sampler in the *source* environment to two separate descriptors in the *target* environment, i.e. struct vkd3d_shader_resource_binding in reverse. We would probably also want to design a way to map a combined sampler to a combined sampler (a sixth array? Or reuse struct vkd3d_shader_descriptor_binding with a new descriptor type?) I suppose the advantage of such an alternative design would be that it reports "one" descriptor as "one", not "two", but the associated complexity seems far greater, and accordingly I don't really want to give it the time of day. (Note also that this patch set handles combined -> combined mapping without any extra effort). I will of course yield to maintainer preference, though. -- As before, I've prepared proof-of-concept code for Wine. The branches are here: https://gitlab.winehq.org/zfigura/vkd3d/-/commits/himavant5 https://gitlab.winehq.org/zfigura/wine/-/commits/himavant6 The relevant test can be run with: make tests/shader_runner.exe && WINE_D3D_CONFIG=renderer=vulkan wine tests/shader_runner.exe ../vkd3d/tests/hlsl/tex2D.shader_test These branches are rather larger than the previous ones. By way of summary, the vkd3d branch contains these patches, plus about two dozen patches to hook up sm1 tests and to fix various corner cases surrounding semantic translation (much of which should be rewritten with a VSIR-based "lowering" approach in mind). The Wine branch contains: * Wine merge request 4027, * the patches for sm1 constant buffers, * a set of patches to transform individual sampler states into sampler objects (of which [1] is the most interesting), and * a set of patches to transform textures into SRVs (of which [2] is the most interesting). As described above, there is not actually any part of the Wine side that touches the vkd3d-shader interface. [1] https://gitlab.winehq.org/zfigura/wine/-/commit/984e478763c99157a6ec49388fe… [2] https://gitlab.winehq.org/zfigura/wine/-/commit/722c1bf1f6a7691c9ed431bd433… ``` What are the roots that clutch, what branches grow Out of this stony rubbish? Son of man, You cannot say, or guess, for you know only A heap of broken images, where the sun beats, And the dead tree gives no shelter, the cricket no relief, And the dry stone no sound of water. ``` -- v2: vkd3d-shader/ir: Translate TEX instructions to SAMPLE. vkd3d-shader: Scan combined sampler declarations. include: Define an API for mapping sm1 samplers to the target environment. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/394

3 5

[PATCH v4 0/5] MR358: vkd3d-shader/hlsl: Parse 'centroid' and 'noperspective' modifiers.
by Nikolay Sivov (＠nsivov) 09 Oct '23

09 Oct '23

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- v4: vkd3d-shader/tpf: Output interpolation modifiers for input declarations. vkd3d-shader/hlsl: Propagate structure fields modifiers when copying shader inputs. vkd3d-shader/hlsl: Allow interpolation modifiers on structure fields. vkd3d-shader/hlsl: Parse 'centroid' and 'noperspective' modifiers. tests: Add a test for interpolation modifiers specified on structure fields. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/358

4 9

[PATCH v7 0/4] MR245: vkd3d-shader/hlsl: Add support for 'break' and 'continue' jumps in loops.
by Nikolay Sivov (＠nsivov) 09 Oct '23

09 Oct '23

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- v7: vkd3d-shader/tpf: Write 'continue' instruction. vkd3d-shader/hlsl: Handle 'continue' statements. vkd3d-shader/hlsl: Allow 'break' instructions in loops. tests: Add some tests for 'break'/'continue' in loops. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/245

4 7

[PATCH v3 0/4] MR3789: Improve media session handling of unexpected errors.
by Santino Mazza (＠tati1454) 09 Oct '23

09 Oct '23

-- v3: mf: Handle errors with source event generator in session. mf/test: Test error case when session is streaming. mf/test: Move stream sink stub above media sink stub. mf/test: Test error cases in media sesssion. https://gitlab.winehq.org/wine/wine/-/merge_requests/3789

3 6

[PATCH 0/4] MR394: vkd3d-shader: sm1 texture interface.
by Zebediah Figura (＠zfigura) 09 Oct '23

09 Oct '23

This defines (and, broadly, implements) the API for mapping sm1 combined samplers to the target environment. This is possibly the simplest bit of API for sm1 support thus far. It does not actually involve any API changes. Rather, each combined sampler is split into two descriptors, one for the sampler and one for the texture, both with the same binding index as the original combined sampler. -- I feel rather positive about this bit of API. it required very little design concern or implementation difficulty on the vkd3d side. On the Wine side, it required quite a lot of change, but I think pretty much all of that change was positive on its own merits, and should probably be applied independently of the sm1/Vulkan work. We've talked about translating wined3d_device_set_sampler_state() and wined3d_device_set_texture() to wined3d_device_set_sampler() and wined3d_device_set_shader_resource_view() for quite some time now, and that was pretty much exactly what was required to make this work—that and choosing the obvious mapping of "same index for both state objects". The most obvious alternative to this design, to me, would be to reroll struct vkd3d_shader_interface_info (or extend it without rerolling), adding a new array for mapping a combined sampler in the *source* environment to two separate descriptors in the *target* environment, i.e. struct vkd3d_shader_resource_binding in reverse. We would probably also want to design a way to map a combined sampler to a combined sampler (a sixth array? Or reuse struct vkd3d_shader_descriptor_binding with a new descriptor type?) I suppose the advantage of such an alternative design would be that it reports "one" descriptor as "one", not "two", but the associated complexity seems far greater, and accordingly I don't really want to give it the time of day. (Note also that this patch set handles combined -> combined mapping without any extra effort). I will of course yield to maintainer preference, though. -- As before, I've prepared proof-of-concept code for Wine. The branches are here: https://gitlab.winehq.org/zfigura/vkd3d/-/commits/himavant5 https://gitlab.winehq.org/zfigura/wine/-/commits/himavant6 The relevant test can be run with: make tests/shader_runner.exe && WINE_D3D_CONFIG=renderer=vulkan wine tests/shader_runner.exe ../vkd3d/tests/hlsl/tex2D.shader_test These branches are rather larger than the previous ones. By way of summary, the vkd3d branch contains these patches, plus about two dozen patches to hook up sm1 tests and to fix various corner cases surrounding semantic translation (much of which should be rewritten with a VSIR-based "lowering" approach in mind). The Wine branch contains: * Wine merge request 4027, * the patches for sm1 constant buffers, * a set of patches to transform individual sampler states into sampler objects (of which [1] is the most interesting), and * a set of patches to transform textures into SRVs (of which [2] is the most interesting). As described above, there is not actually any part of the Wine side that touches the vkd3d-shader interface. [1] https://gitlab.winehq.org/zfigura/wine/-/commit/984e478763c99157a6ec49388fe… [2] https://gitlab.winehq.org/zfigura/wine/-/commit/722c1bf1f6a7691c9ed431bd433… -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/394

3 6

[PATCH v2 0/3] MR3789: Improve media session handling of unexpected errors.
by Santino Mazza (＠tati1454) 09 Oct '23

09 Oct '23

-- v2: mf: Handle errors with source event generator in session. mf/test: Test error case when session is streaming. https://gitlab.winehq.org/wine/wine/-/merge_requests/3789

4 7