- Wine-Commits - list.winehq.org

Mohamad Al-Jaf : include: Add ISystemMediaTransportControls interface definition.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 0e90cbf98903b766378559491519328334bae3db URL: https://gitlab.winehq.org/wine/wine/-/commit/0e90cbf98903b76637855949151932… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Sep 27 00:30:50 2023 -0400 include: Add ISystemMediaTransportControls interface definition. --- include/windows.media.idl | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/include/windows.media.idl b/include/windows.media.idl index 03d03a6389f..4896f66b45b 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -26,9 +26,24 @@ import "windows.foundation.idl"; namespace Windows.Media { typedef enum AudioProcessing AudioProcessing; + typedef enum MediaPlaybackStatus MediaPlaybackStatus; + typedef enum SoundLevel SoundLevel; + typedef enum SystemMediaTransportControlsButton SystemMediaTransportControlsButton; + typedef enum SystemMediaTransportControlsProperty SystemMediaTransportControlsProperty; interface IMediaControl; interface IMediaMarker; + interface ISystemMediaTransportControls; + interface ISystemMediaTransportControls2; + interface ISystemMediaTransportControlsButtonPressedEventArgs; + interface ISystemMediaTransportControlsDisplayUpdater; + interface ISystemMediaTransportControlsPropertyChangedEventArgs; + interface ISystemMediaTransportControlsStatics; + + runtimeclass SystemMediaTransportControls; + runtimeclass SystemMediaTransportControlsButtonPressedEventArgs; + runtimeclass SystemMediaTransportControlsDisplayUpdater; + runtimeclass SystemMediaTransportControlsPropertyChangedEventArgs; declare { @@ -36,6 +51,8 @@ namespace Windows.Media interface Windows.Foundation.Collections.IIterator<Windows.Media.IMediaMarker*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; interface Windows.Foundation.Collections.IVector<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.TypedEventHandler<Windows.Media.SystemMediaTransportControls*, Windows.Media.SystemMediaTransportControlsButtonPressedEventArgs*>; + interface Windows.Foundation.TypedEventHandler<Windows.Media.SystemMediaTransportControls*, Windows.Media.SystemMediaTransportControlsPropertyChangedEventArgs*>; } [ @@ -47,6 +64,53 @@ namespace Windows.Media Raw = 1, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum MediaPlaybackStatus + { + Closed = 0, + Changing = 1, + Stopped = 2, + Playing = 3, + Paused = 4, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum SoundLevel + { + Muted = 0, + Low = 1, + Full = 2, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum SystemMediaTransportControlsButton + { + Play = 0, + Pause = 1, + Stop = 2, + Record = 3, + FastForward = 4, + Rewind = 5, + Next = 6, + Previous = 7, + ChannelUp = 8, + ChannelDown = 9, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum SystemMediaTransportControlsProperty + { + SoundLevel = 0, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625) @@ -58,4 +122,108 @@ namespace Windows.Media [propget] HRESULT Text([out, retval] HSTRING *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SystemMediaTransportControls), + uuid(99fa3ff4-1742-42a6-902e-087d41f965ec) + ] + interface ISystemMediaTransportControls : IInspectable + { + [propget] HRESULT PlaybackStatus([out, retval] Windows.Media.MediaPlaybackStatus *value); + [propput] HRESULT PlaybackStatus([in] Windows.Media.MediaPlaybackStatus value); + [propget] HRESULT DisplayUpdater([out, retval] Windows.Media.SystemMediaTransportControlsDisplayUpdater **value); + [propget] HRESULT SoundLevel([out, retval] Windows.Media.SoundLevel *value); + [propget] HRESULT IsEnabled([out, retval] boolean *value); + [propput] HRESULT IsEnabled([in] boolean value); + [propget] HRESULT IsPlayEnabled([out, retval] boolean *value); + [propput] HRESULT IsPlayEnabled([in] boolean value); + [propget] HRESULT IsStopEnabled([out, retval] boolean *value); + [propput] HRESULT IsStopEnabled([in] boolean value); + [propget] HRESULT IsPauseEnabled([out, retval] boolean *value); + [propput] HRESULT IsPauseEnabled([in] boolean value); + [propget] HRESULT IsRecordEnabled([out, retval] boolean *value); + [propput] HRESULT IsRecordEnabled([in] boolean value); + [propget] HRESULT IsFastForwardEnabled([out, retval] boolean *value); + [propput] HRESULT IsFastForwardEnabled([in] boolean value); + [propget] HRESULT IsRewindEnabled([out, retval] boolean *value); + [propput] HRESULT IsRewindEnabled([in] boolean value); + [propget] HRESULT IsPreviousEnabled([out, retval] boolean *value); + [propput] HRESULT IsPreviousEnabled([in] boolean value); + [propget] HRESULT IsNextEnabled([out, retval] boolean *value); + [propput] HRESULT IsNextEnabled([in] boolean value); + [propget] HRESULT IsChannelUpEnabled([out, retval] boolean *value); + [propput] HRESULT IsChannelUpEnabled([in] boolean value); + [propget] HRESULT IsChannelDownEnabled([out, retval] boolean *value); + [propput] HRESULT IsChannelDownEnabled([in] boolean value); + [eventadd] HRESULT ButtonPressed( + [in] Windows.Foundation.TypedEventHandler<Windows.Media.SystemMediaTransportControls *, Windows.Media.SystemMediaTransportControlsButtonPressedEventArgs *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT ButtonPressed([in] EventRegistrationToken token); + [eventadd] HRESULT PropertyChanged( + [in] Windows.Foundation.TypedEventHandler<Windows.Media.SystemMediaTransportControls *, Windows.Media.SystemMediaTransportControlsPropertyChangedEventArgs *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT PropertyChanged([in] EventRegistrationToken token); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SystemMediaTransportControlsButtonPressedEventArgs), + uuid(b7f47116-a56f-4dc8-9e11-92031f4a87c2) + ] + interface ISystemMediaTransportControlsButtonPressedEventArgs : IInspectable + { + [propget] HRESULT Button([out, retval] Windows.Media.SystemMediaTransportControlsButton *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SystemMediaTransportControlsPropertyChangedEventArgs), + uuid(d0ca0936-339b-4cb3-8eeb-737607f56e08) + ] + interface ISystemMediaTransportControlsPropertyChangedEventArgs : IInspectable + { + [propget] HRESULT Property([out, retval] Windows.Media.SystemMediaTransportControlsProperty *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.ISystemMediaTransportControlsStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(mta) + ] + runtimeclass SystemMediaTransportControls + { + [default] interface Windows.Media.ISystemMediaTransportControls; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.ISystemMediaTransportControls2; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SystemMediaTransportControlsButtonPressedEventArgs + { + [default] interface Windows.Media.ISystemMediaTransportControlsButtonPressedEventArgs; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SystemMediaTransportControlsDisplayUpdater + { + [default] interface Windows.Media.ISystemMediaTransportControlsDisplayUpdater; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SystemMediaTransportControlsPropertyChangedEventArgs + { + [default] interface Windows.Media.ISystemMediaTransportControlsPropertyChangedEventArgs; + } }

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Add stub DLL.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 8b329317b711182aa04be1951665eac7ed1aa1e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b329317b711182aa04be1951665ea… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Sep 13 02:06:37 2023 -0400 windows.media.mediacontrol: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.media.mediacontrol/Makefile.in | 8 ++ dlls/windows.media.mediacontrol/classes.idl | 23 ++++ dlls/windows.media.mediacontrol/main.c | 139 +++++++++++++++++++++ dlls/windows.media.mediacontrol/private.h | 38 ++++++ dlls/windows.media.mediacontrol/tests/Makefile.in | 5 + .../tests/mediacontrol.c | 86 +++++++++++++ .../windows.media.mediacontrol.spec | 11 ++ 9 files changed, 315 insertions(+)

1 0

Brendan Shanks : winemac.drv: Simplify control flow where possible after the removal of NSAutoreleasePool.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 29260f77fbe5f04b010f3d18878e33bd69761597 URL: https://gitlab.winehq.org/wine/wine/-/commit/29260f77fbe5f04b010f3d18878e33… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 4 22:08:19 2023 -0700 winemac.drv: Simplify control flow where possible after the removal of NSAutoreleasePool. --- dlls/winemac.drv/cocoa_display.m | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 5932e8070b1..2f3d86b51d5 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -60,8 +60,6 @@ int macdrv_get_displays(struct macdrv_display** displays, int* count) { @autoreleasepool { - int ret = -1; - NSArray* screens = [NSScreen screens]; if (screens) { @@ -92,11 +90,11 @@ int macdrv_get_displays(struct macdrv_display** displays, int* count) *displays = disps; *count = num_screens; - ret = 0; + return 0; } } - return ret; + return -1; } } @@ -307,25 +305,24 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) BOOL hide_integrated = FALSE; int primary_index = 0, i; int gpu_count = 0; - int ret = -1; /* Test if Metal is available */ if (&MTLCopyAllDevices == NULL) - goto done; + return -1; NSArray<id<MTLDevice>>* devices = [MTLCopyAllDevices() autorelease]; if (!devices.count || ![devices[0] respondsToSelector:@selector(registryID)]) - goto done; + return -1; gpus = calloc(devices.count, sizeof(*gpus)); if (!gpus) - goto done; + return -1; /* Use MTLCreateSystemDefaultDevice instead of CGDirectDisplayCopyCurrentMetalDevice(CGMainDisplayID()) to get * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps * using the integrated GPU. This is the behavior of Windows on a Mac. */ primary_device = [MTLCreateSystemDefaultDevice() autorelease]; if (macdrv_get_gpu_info_from_mtldevice(&primary_gpu, primary_device)) - goto done; + goto fail; /* Hide the integrated GPU if the system default device is a dedicated GPU */ if (!primary_device.isLowPower) @@ -337,7 +334,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) for (i = 0; i < devices.count; i++) { if (macdrv_get_gpu_info_from_mtldevice(&gpus[gpu_count], devices[i])) - goto done; + goto fail; if (hide_integrated && devices[i].isLowPower) { @@ -362,11 +359,10 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) *new_gpus = gpus; *count = gpu_count; - ret = 0; -done: - if (ret) - macdrv_free_gpus(gpus); - return ret; + return 0; +fail: + macdrv_free_gpus(gpus); + return -1; } } @@ -382,18 +378,16 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp @autoreleasepool { id<MTLDevice> device; - int ret = -1; /* Test if Metal is available */ if (&CGDirectDisplayCopyCurrentMetalDevice == NULL) - goto done; + return -1; device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) - ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); - -done: - return ret; + return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + else + return -1; } }

1 0

Brendan Shanks : winemac.drv: Use @autoreleasepool instead of NSAutoreleasePool.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: c937e991e1acad45c78a3b5a2977cef11a6b9f89 URL: https://gitlab.winehq.org/wine/wine/-/commit/c937e991e1acad45c78a3b5a2977ce… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 4 22:08:00 2023 -0700 winemac.drv: Use @autoreleasepool instead of NSAutoreleasePool. --- dlls/winemac.drv/cocoa_app.m | 64 +++++++++++----------- dlls/winemac.drv/cocoa_clipboard.m | 5 +- dlls/winemac.drv/cocoa_display.m | 21 ++++---- dlls/winemac.drv/cocoa_event.m | 57 ++++++++++---------- dlls/winemac.drv/cocoa_main.m | 54 ++++++++++--------- dlls/winemac.drv/cocoa_opengl.m | 29 +++++----- dlls/winemac.drv/cocoa_window.m | 105 +++++++++++++++++++------------------ 7 files changed, 172 insertions(+), 163 deletions(-)

1 0

Ally Sommers : server: Move getpeername() implementation from ntdll/unix.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 3582ba9dc4b711747cdd52f285a5243b9278db6e URL: https://gitlab.winehq.org/wine/wine/-/commit/3582ba9dc4b711747cdd52f285a524… Author: Ally Sommers <dropbear.sh(a)gmail.com> Date: Thu Jun 15 11:51:33 2023 -0700 server: Move getpeername() implementation from ntdll/unix. This brings getpeername() in line with getsockname(), which is also implemented in wineserver. It also allows getpeername() to return a possibly-more-accurate peer name, as in the case of AF_UNIX sockets. --- dlls/ntdll/unix/socket.c | 24 ++----------------- dlls/ws2_32/socket.c | 13 ++++++----- dlls/ws2_32/tests/sock.c | 28 +++++++++------------- server/sock.c | 61 +++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 78 insertions(+), 48 deletions(-)

1 0

Paul Gofman : ntdll: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 4b9a095e841ddb6387797e0fa474a9a6184c1ed5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b9a095e841ddb6387797e0fa474a9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 27 20:17:13 2023 -0600 ntdll: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION. --- dlls/ntdll/unix/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e09bf34b07d..3f0ac8cb84e 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -169,7 +169,7 @@ static NTSTATUS sock_errno_to_status( int err ) case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; - case EDESTADDRREQ: return STATUS_INVALID_PARAMETER; + case EDESTADDRREQ: return STATUS_INVALID_CONNECTION; case EMSGSIZE: return STATUS_BUFFER_OVERFLOW; case EPROTONOSUPPORT: case ESOCKTNOSUPPORT: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index eddef24048c..fcf4da3851e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13901,7 +13901,7 @@ static void test_connect_udp(void) SetLastError(0xdeadbeef); ret = send(client, "data", 4, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = recv(server, buffer, sizeof(buffer), 0); @@ -13949,7 +13949,7 @@ static void test_connect_udp(void) SetLastError(0xdeadbeef); ret = send(server, "data", 4, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); ok(!ret, "got error %lu\n", GetLastError());

1 0

Francisco Casas : vkd3d-shader/tpf: Use lookup table for opcode_info_from_sm4().
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: 014960b64bf5271303da74e18c380891e7de74d3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/014960b64bf5271303da74e18c380… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jul 27 18:34:26 2023 -0400 vkd3d-shader/tpf: Use lookup table for opcode_info_from_sm4(). Makes get_opcode_info() and thus, tpf reading a little faster. --- libs/vkd3d-shader/tpf.c | 599 ++++++++++++++++++++++++------------------------ 1 file changed, 302 insertions(+), 297 deletions(-)

1 0

Francisco Casas : vkd3d-shader/tpf: Don't store sm4 instruction extra bits in the opcode.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: 88b644a11dfbe261aa80d66a3ec2c73def75d1e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/88b644a11dfbe261aa80d66a3ec2c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 1 22:28:54 2023 -0400 vkd3d-shader/tpf: Don't store sm4 instruction extra bits in the opcode. Adding extra bits to instr->opcode doesn't seem correct, given that it is an enum. For instance, get_opcode_info() would return NULL if additional bits are added to instr->opcode. This is not a problem now because that function is called when reading and not writing. --- libs/vkd3d-shader/tpf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 21298aba..34a7da54 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3632,6 +3632,7 @@ static uint32_t sm4_encode_instruction_modifier(const struct sm4_instruction_mod struct sm4_instruction { enum vkd3d_sm4_opcode opcode; + uint32_t extra_bits; struct sm4_instruction_modifier modifiers[1]; unsigned int modifier_count; @@ -3981,7 +3982,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4_instruction *instr) { struct vkd3d_bytecode_buffer *buffer = tpf->buffer; - uint32_t token = instr->opcode; + uint32_t token = instr->opcode | instr->extra_bits; unsigned int size, i, j; size_t token_position; @@ -4076,7 +4077,7 @@ static void write_sm4_dcl_samplers(const struct tpf_writer *tpf, const struct ex component_type = hlsl_type_get_component_type(tpf->ctx, resource->data_type, 0); if (component_type->sampler_dim == HLSL_SAMPLER_DIM_COMPARISON) - instr.opcode |= VKD3D_SM4_SAMPLER_COMPARISON << VKD3D_SM4_SAMPLER_MODE_SHIFT; + instr.extra_bits |= VKD3D_SM4_SAMPLER_COMPARISON << VKD3D_SM4_SAMPLER_MODE_SHIFT; assert(resource->regset == HLSL_REGSET_SAMPLERS); @@ -4135,12 +4136,12 @@ static void write_sm4_dcl_textures(const struct tpf_writer *tpf, const struct ex { instr.opcode = VKD3D_SM4_OP_DCL_RESOURCE; } - instr.opcode |= (sm4_resource_dimension(component_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT); + instr.extra_bits |= (sm4_resource_dimension(component_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT); if (component_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS || component_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY) { - instr.opcode |= component_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; + instr.extra_bits |= component_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; } write_sm4_instruction(tpf, &instr); @@ -4217,7 +4218,7 @@ static void write_sm4_dcl_semantic(const struct tpf_writer *tpf, const struct hl if ((var->storage_modifiers & HLSL_STORAGE_NOINTERPOLATION) || type_is_integer(var->data_type)) mode = VKD3DSIM_CONSTANT; - instr.opcode |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; + instr.extra_bits |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; } } else @@ -4575,7 +4576,7 @@ static void write_sm4_sampleinfo(const struct tpf_writer *tpf, const struct hlsl memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_SAMPLE_INFO; if (dst->data_type->base_type == HLSL_TYPE_UINT) - instr.opcode |= VKD3DSI_SAMPLE_INFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; + instr.extra_bits |= VKD3DSI_SAMPLE_INFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1; @@ -4597,7 +4598,7 @@ static void write_sm4_resinfo(const struct tpf_writer *tpf, const struct hlsl_ir memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_RESINFO; if (dst->data_type->base_type == HLSL_TYPE_UINT) - instr.opcode |= VKD3DSI_RESINFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; + instr.extra_bits |= VKD3DSI_RESINFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1;

1 0

Francisco Casas : vkd3d-shader/tpf: Apply mask to swizzle when swizzle type is scalar.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: 0a5fa80f0204e7c757c7c1a9498988175056568f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a5fa80f0204e7c757c7c1a949898… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jul 18 20:21:45 2023 -0400 vkd3d-shader/tpf: Apply mask to swizzle when swizzle type is scalar. In native's output, for scalar swizzles only the first component of the swizzle is written, the others are left as zero. --- libs/vkd3d-shader/tpf.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index b72f4839..21298aba 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3913,8 +3913,13 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk token |= reg_dim << VKD3D_SM4_DIMENSION_SHIFT; if (reg_dim == VKD3D_SM4_DIMENSION_VEC4) { - token |= (uint32_t)register_type_info->default_src_swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; - token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; + uint32_t swizzle_type = (uint32_t)register_type_info->default_src_swizzle_type; + + token |= swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + if (swizzle_type == VKD3D_SM4_SWIZZLE_SCALAR) + token |= (swizzle_to_sm4(src->swizzle) & 0x3) << VKD3D_SM4_SWIZZLE_SHIFT; + else + token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; } switch (src->modifiers)

1 0

Francisco Casas : vkd3d-shader/tpf: Don't calculate instruction size in advance.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: f06169afc5b835db538363131fcb525d8f30b493 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f06169afc5b835db538363131fcb5… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Oct 3 12:10:23 2023 -0300 vkd3d-shader/tpf: Don't calculate instruction size in advance. Co-authored-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/tpf.c | 48 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c6c59c18..b72f4839 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3973,53 +3973,25 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk } } -static uint32_t sm4_token_count_from_dst_register(const struct vkd3d_shader_dst_param *dst) -{ - uint32_t order = 1; - if (dst->reg.type == VKD3DSPR_IMMCONST) - order += dst->reg.dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; - order += dst->reg.idx_count; - return order; -} - -static uint32_t sm4_token_count_from_src_register(const struct vkd3d_shader_src_param *src) -{ - uint32_t order = 1; - if (src->reg.type == VKD3DSPR_IMMCONST) - order += src->reg.dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; - order += src->reg.idx_count; - if (src->modifiers) - ++order; - return order; -} - static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4_instruction *instr) { struct vkd3d_bytecode_buffer *buffer = tpf->buffer; uint32_t token = instr->opcode; - unsigned int size = 1, i, j; - - size += instr->modifier_count; - for (i = 0; i < instr->dst_count; ++i) - size += sm4_token_count_from_dst_register(&instr->dsts[i]); - for (i = 0; i < instr->src_count; ++i) - size += sm4_token_count_from_src_register(&instr->srcs[i]); - size += instr->idx_count; - if (instr->byte_stride) - ++size; - - token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + unsigned int size, i, j; + size_t token_position; if (instr->modifier_count > 0) token |= VKD3D_SM4_INSTRUCTION_MODIFIER; - put_u32(buffer, token); + + token_position = put_u32(buffer, 0); for (i = 0; i < instr->modifier_count; ++i) { - token = sm4_encode_instruction_modifier(&instr->modifiers[i]); + uint32_t modifier_token = sm4_encode_instruction_modifier(&instr->modifiers[i]); + if (instr->modifier_count > i + 1) - token |= VKD3D_SM4_INSTRUCTION_MODIFIER; - put_u32(buffer, token); + modifier_token |= VKD3D_SM4_INSTRUCTION_MODIFIER; + put_u32(buffer, modifier_token); } for (i = 0; i < instr->dst_count; ++i) @@ -4033,6 +4005,10 @@ static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4 for (j = 0; j < instr->idx_count; ++j) put_u32(buffer, instr->idx[j]); + + size = (bytecode_get_size(buffer) - token_position) / sizeof(uint32_t); + token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + set_u32(buffer, token_position, token); } static bool encode_texel_offset_as_aoffimmi(struct sm4_instruction *instr,

1 0