January 2024 - Wine-commits

Rémi Bernon : winebus: Append is_gamepad to the device instance id.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: ef316163931a63e1e9655aed25cf8fae0066aa36 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef316163931a63e1e9655aed25cf8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 27 08:24:58 2023 +0200 winebus: Append is_gamepad to the device instance id. --- dlls/winebus.sys/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e5adfed8611..be635632e80 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -189,7 +189,10 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) - swprintf(dst, len, L"%i&%s&%x&%i", ext->desc.version, ext->desc.serialnumber, ext->desc.uid, ext->index); + { + swprintf(dst, len, L"%u&%s&%x&%u&%u", ext->desc.version, ext->desc.serialnumber, + ext->desc.uid, ext->index, ext->desc.is_gamepad); + } return dst; }

1 0

Rémi Bernon : winebus: Allow specific devices to prefer hidraw backend.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 814d2c176d23c581353ba5679977415d2218d0c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/814d2c176d23c581353ba567997741… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 11:53:20 2024 +0100 winebus: Allow specific devices to prefer hidraw backend. And use SDL otherwise in priority over evdev for abstracted HID device implementation. --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_udev.c | 33 +------------------------ dlls/winebus.sys/main.c | 59 ++++++++++++++++++++++++++++++++++++++------ dlls/winebus.sys/unixlib.h | 5 ++-- 4 files changed, 57 insertions(+), 42 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 99334d141bb..7c8c3cc3529 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -271,7 +271,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * { struct device_desc desc = { - .input = -1, + .input = -1, .is_hidraw = TRUE, .serialnumber = {'0','0','0','0',0}, }; struct iohid_device *impl; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 34b3305ed88..c8620352766 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -530,29 +530,6 @@ static const struct raw_device_vtbl hidraw_device_vtbl = #ifdef HAS_PROPER_INPUT_HEADER -static const char *get_device_syspath(struct udev_device *dev) -{ - struct udev_device *parent; - - if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL))) - return udev_device_get_syspath(parent); - - if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"))) - return udev_device_get_syspath(parent); - - return ""; -} - -static struct base_device *find_device_from_syspath(const char *path) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (!strcmp(get_device_syspath(impl->udev_device), path)) return impl; - - return NULL; -} - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) static const USAGE_AND_PAGE *what_am_I(struct udev_device *dev, int fd) @@ -1312,15 +1289,6 @@ static void udev_add_device(struct udev_device *dev, int fd) TRACE("udev %s syspath %s\n", debugstr_a(devnode), udev_device_get_syspath(dev)); -#ifdef HAS_PROPER_INPUT_HEADER - if ((impl = find_device_from_syspath(get_device_syspath(dev)))) - { - TRACE("duplicate device found, not adding the new one\n"); - close(fd); - return; - } -#endif - get_device_subsystem_info(dev, "hid", &desc, &bus); get_device_subsystem_info(dev, "input", &desc, &bus); get_device_subsystem_info(dev, "usb", &desc, &bus); @@ -1334,6 +1302,7 @@ static void udev_add_device(struct udev_device *dev, int fd) #endif if (!desc.manufacturer[0]) memcpy(desc.manufacturer, hidraw, sizeof(hidraw)); + desc.is_hidraw = TRUE; #ifdef HAVE_LINUX_HIDRAW_H if (!desc.product[0] && ioctl(fd, HIDIOCGRAWNAME(sizeof(product) - 1), product) >= 0) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index be635632e80..b19b1f1cb96 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -401,6 +401,36 @@ static DWORD check_bus_option(const WCHAR *option, DWORD default_value) return default_value; } +static BOOL is_hidraw_enabled(WORD vid, WORD pid) +{ + char buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[1024])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + WCHAR vidpid[MAX_PATH], *tmp; + BOOL prefer_hidraw = FALSE; + UNICODE_STRING str; + DWORD size; + + if (check_bus_option(L"DisableHidraw", FALSE)) return FALSE; + + RtlInitUnicodeString(&str, L"EnableHidraw"); + if (!NtQueryValueKey(driver_key, &str, KeyValuePartialInformation, info, + sizeof(buffer) - sizeof(WCHAR), &size)) + { + UINT len = swprintf(vidpid, ARRAY_SIZE(vidpid), L"%04X:%04X", vid, pid); + size -= FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); + tmp = (WCHAR *)info->Data; + + while (size >= len * sizeof(WCHAR)) + { + if (!wcsnicmp(tmp, vidpid, len)) prefer_hidraw = TRUE; + size -= (len + 1) * sizeof(WCHAR); + tmp += len + 1; + } + } + + return prefer_hidraw; +} + static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) { struct hid_report *report; @@ -580,6 +610,14 @@ static DWORD CALLBACK bus_main_thread(void *args) IoInvalidateDeviceRelations(bus_pdo, BusRelations); break; case BUS_EVENT_TYPE_DEVICE_CREATED: + { + const struct device_desc *desc = &event->device_created.desc; + if (!desc->is_hidraw != !is_hidraw_enabled(desc->vid, desc->pid)) + { + WARN("ignoring %shidraw device %04x:%04x\n", desc->is_hidraw ? "" : "non-", desc->vid, desc->pid); + break; + } + device = bus_create_hid_device(&event->device_created.desc, event->device); if (device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); else @@ -589,6 +627,7 @@ static DWORD CALLBACK bus_main_thread(void *args) winebus_call(device_remove, &params); } break; + } case BUS_EVENT_TYPE_INPUT_REPORT: RtlEnterCriticalSection(&device_list_cs); device = bus_find_unix_device(event->device); @@ -739,7 +778,7 @@ static NTSTATUS sdl_driver_init(void) return status; } -static NTSTATUS udev_driver_init(void) +static NTSTATUS udev_driver_init(BOOL enable_sdl) { struct udev_bus_options bus_options; struct bus_main_params bus = @@ -752,7 +791,7 @@ static NTSTATUS udev_driver_init(void) bus_options.disable_hidraw = check_bus_option(L"DisableHidraw", 0); if (bus_options.disable_hidraw) TRACE("UDEV hidraw devices disabled in registry\n"); - bus_options.disable_input = check_bus_option(L"DisableInput", 0); + bus_options.disable_input = check_bus_option(L"DisableInput", 0) || enable_sdl; if (bus_options.disable_input) TRACE("UDEV input devices disabled in registry\n"); bus_options.disable_udevd = check_bus_option(L"DisableUdevd", 0); if (bus_options.disable_udevd) TRACE("UDEV udevd use disabled in registry\n"); @@ -771,12 +810,19 @@ static NTSTATUS iohid_driver_init(void) .wait_code = iohid_wait, }; + if (check_bus_option(L"DisableHidraw", FALSE)) + { + TRACE("IOHID hidraw devices disabled in registry\n"); + return STATUS_SUCCESS; + } + return bus_main_thread_start(&bus); } static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + BOOL enable_sdl; NTSTATUS ret; switch (irpsp->MinorFunction) @@ -788,11 +834,10 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) mouse_device_create(); keyboard_device_create(); - if (!check_bus_option(L"Enable SDL", 1) || sdl_driver_init()) - { - udev_driver_init(); - iohid_driver_init(); - } + if ((enable_sdl = check_bus_option(L"Enable SDL", 1))) + enable_sdl = !sdl_driver_init(); + udev_driver_init(enable_sdl); + iohid_driver_init(); irp->IoStatus.Status = STATUS_SUCCESS; break; diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 731745bb9a4..2425484b33f 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -38,6 +38,7 @@ struct device_desc UINT input; UINT uid; BOOL is_gamepad; + BOOL is_hidraw; WCHAR manufacturer[MAX_PATH]; WCHAR product[MAX_PATH]; @@ -147,8 +148,8 @@ enum unix_funcs static inline const char *debugstr_device_desc(struct device_desc *desc) { if (!desc) return "(null)"; - return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, is_gamepad %u}", - desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->is_gamepad); + return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, is_gamepad %u, is_hidraw %u}", + desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->is_gamepad, desc->is_hidraw); } #endif /* __WINEBUS_UNIXLIB_H */

1 0

Rémi Bernon : winebus: Move device identification helpers to unixlib.h.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 13d8571b082102e030783bb13d6391b312c74aab URL: https://gitlab.winehq.org/wine/wine/-/commit/13d8571b082102e030783bb13d6391… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 12:04:58 2024 +0100 winebus: Move device identification helpers to unixlib.h. --- dlls/winebus.sys/unix_private.h | 4 ---- dlls/winebus.sys/unixlib.c | 40 ---------------------------------------- dlls/winebus.sys/unixlib.h | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 1ec414cce73..f2f4e71f014 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -266,8 +266,4 @@ extern void hid_device_drop_report(struct unix_device *iface); extern void hid_device_set_effect_state(struct unix_device *iface, BYTE index, BYTE flags); -BOOL is_xbox_gamepad(WORD vid, WORD pid); -BOOL is_dualshock4_gamepad(WORD vid, WORD pid); -BOOL is_dualsense_gamepad(WORD vid, WORD pid); - #endif /* __WINEBUS_UNIX_PRIVATE_H */ diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 82eab3717ca..2668468305c 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -38,46 +38,6 @@ #include "unix_private.h" -BOOL is_xbox_gamepad(WORD vid, WORD pid) -{ - if (vid != 0x045e) return FALSE; - if (pid == 0x0202) return TRUE; /* Xbox Controller */ - if (pid == 0x0285) return TRUE; /* Xbox Controller S */ - if (pid == 0x0289) return TRUE; /* Xbox Controller S */ - if (pid == 0x028e) return TRUE; /* Xbox360 Controller */ - if (pid == 0x028f) return TRUE; /* Xbox360 Wireless Controller */ - if (pid == 0x02d1) return TRUE; /* Xbox One Controller */ - if (pid == 0x02dd) return TRUE; /* Xbox One Controller (Covert Forces/Firmware 2015) */ - if (pid == 0x02e0) return TRUE; /* Xbox One X Controller */ - if (pid == 0x02e3) return TRUE; /* Xbox One Elite Controller */ - if (pid == 0x02e6) return TRUE; /* Wireless XBox Controller Dongle */ - if (pid == 0x02ea) return TRUE; /* Xbox One S Controller */ - if (pid == 0x02fd) return TRUE; /* Xbox One S Controller (Firmware 2017) */ - if (pid == 0x0b00) return TRUE; /* Xbox Elite 2 */ - if (pid == 0x0b05) return TRUE; /* Xbox Elite 2 Wireless */ - if (pid == 0x0b12) return TRUE; /* Xbox Series */ - if (pid == 0x0b13) return TRUE; /* Xbox Series Wireless */ - if (pid == 0x0719) return TRUE; /* Xbox 360 Wireless Adapter */ - return FALSE; -} - -BOOL is_dualshock4_gamepad(WORD vid, WORD pid) -{ - if (vid != 0x054c) return FALSE; - if (pid == 0x05c4) return TRUE; /* DualShock 4 [CUH-ZCT1x] */ - if (pid == 0x09cc) return TRUE; /* DualShock 4 [CUH-ZCT2x] */ - if (pid == 0x0ba0) return TRUE; /* Dualshock 4 Wireless Adaptor */ - return FALSE; -} - -BOOL is_dualsense_gamepad(WORD vid, WORD pid) -{ - if (vid != 0x054c) return FALSE; - if (pid == 0x0ce6) return TRUE; /* DualSense */ - if (pid == 0x0df2) return TRUE; /* DualSense Edge */ - return FALSE; -} - struct mouse_device { struct unix_device unix_device; diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 2425484b33f..80852696dd1 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -152,4 +152,44 @@ static inline const char *debugstr_device_desc(struct device_desc *desc) desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->is_gamepad, desc->is_hidraw); } +static inline BOOL is_xbox_gamepad(WORD vid, WORD pid) +{ + if (vid != 0x045e) return FALSE; + if (pid == 0x0202) return TRUE; /* Xbox Controller */ + if (pid == 0x0285) return TRUE; /* Xbox Controller S */ + if (pid == 0x0289) return TRUE; /* Xbox Controller S */ + if (pid == 0x028e) return TRUE; /* Xbox360 Controller */ + if (pid == 0x028f) return TRUE; /* Xbox360 Wireless Controller */ + if (pid == 0x02d1) return TRUE; /* Xbox One Controller */ + if (pid == 0x02dd) return TRUE; /* Xbox One Controller (Covert Forces/Firmware 2015) */ + if (pid == 0x02e0) return TRUE; /* Xbox One X Controller */ + if (pid == 0x02e3) return TRUE; /* Xbox One Elite Controller */ + if (pid == 0x02e6) return TRUE; /* Wireless XBox Controller Dongle */ + if (pid == 0x02ea) return TRUE; /* Xbox One S Controller */ + if (pid == 0x02fd) return TRUE; /* Xbox One S Controller (Firmware 2017) */ + if (pid == 0x0b00) return TRUE; /* Xbox Elite 2 */ + if (pid == 0x0b05) return TRUE; /* Xbox Elite 2 Wireless */ + if (pid == 0x0b12) return TRUE; /* Xbox Series */ + if (pid == 0x0b13) return TRUE; /* Xbox Series Wireless */ + if (pid == 0x0719) return TRUE; /* Xbox 360 Wireless Adapter */ + return FALSE; +} + +static inline BOOL is_dualshock4_gamepad(WORD vid, WORD pid) +{ + if (vid != 0x054c) return FALSE; + if (pid == 0x05c4) return TRUE; /* DualShock 4 [CUH-ZCT1x] */ + if (pid == 0x09cc) return TRUE; /* DualShock 4 [CUH-ZCT2x] */ + if (pid == 0x0ba0) return TRUE; /* Dualshock 4 Wireless Adaptor */ + return FALSE; +} + +static inline BOOL is_dualsense_gamepad(WORD vid, WORD pid) +{ + if (vid != 0x054c) return FALSE; + if (pid == 0x0ce6) return TRUE; /* DualSense */ + if (pid == 0x0df2) return TRUE; /* DualSense Edge */ + return FALSE; +} + #endif /* __WINEBUS_UNIXLIB_H */

1 0

Rémi Bernon : winebus: Prefer hidraw backends for DS4 and DS5 gamepads.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 173ed7e61b5b80ccd4d268e80c5c15f9fb288aa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/173ed7e61b5b80ccd4d268e80c5c15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 12:06:23 2024 +0100 winebus: Prefer hidraw backends for DS4 and DS5 gamepads. --- dlls/winebus.sys/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index b19b1f1cb96..b0252b438ea 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -412,6 +412,9 @@ static BOOL is_hidraw_enabled(WORD vid, WORD pid) if (check_bus_option(L"DisableHidraw", FALSE)) return FALSE; + if (is_dualshock4_gamepad(vid, pid)) prefer_hidraw = TRUE; + if (is_dualsense_gamepad(vid, pid)) prefer_hidraw = TRUE; + RtlInitUnicodeString(&str, L"EnableHidraw"); if (!NtQueryValueKey(driver_key, &str, KeyValuePartialInformation, info, sizeof(buffer) - sizeof(WCHAR), &size))

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle scalar values in ternaries.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 275901557caab05a73f05aad2de4cf9079887f10 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/275901557caab05a73f05aad2de4c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 16 18:14:30 2024 -0600 vkd3d-shader/hlsl: Handle scalar values in ternaries. --- libs/vkd3d-shader/hlsl.y | 5 +++++ tests/hlsl/ternary.shader_test | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9ee67914..12c955f2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4115,6 +4115,11 @@ static bool add_ternary(struct hlsl_ctx *ctx, struct hlsl_block *block, if (!(cond = add_implicit_conversion(ctx, block, cond, cond_type, &cond->loc))) return false; } + else if (common_type->dimx == 1 && common_type->dimy == 1) + { + common_type = hlsl_get_numeric_type(ctx, cond_type->class, + common_type->base_type, cond_type->dimx, cond_type->dimy); + } if (!(first = add_implicit_conversion(ctx, block, first, common_type, &first->loc))) return false; diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test index 3b62513d..5f38d896 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -282,7 +282,7 @@ draw quad probe all rgba (5.0, 6.0, 7.0, 8.0) -[pixel shader todo] +[pixel shader] uniform float4 cond; uniform float4 a, b; @@ -296,11 +296,11 @@ float4 main() : sv_target uniform 0 float4 1.0 0.0 1.0 0.0 uniform 4 float4 1.0 2.0 3.0 4.0 uniform 8 float4 5.0 6.0 7.0 8.0 -todo draw quad +draw quad probe all rgba (1.0, 5.0, 1.0, 5.0) -[pixel shader todo] +[pixel shader] // "scalar" can mean any 1-component numeric type. static float4 cond = {1, 0, 0, 1}; @@ -313,7 +313,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 3.0, 3.0, 2.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Forbid mismatched argument types in ternaries.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 9ad48f16ea261792045d16e884eb1f768227d90c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9ad48f16ea261792045d16e884eb1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 16 18:45:29 2024 -0600 vkd3d-shader/hlsl: Forbid mismatched argument types in ternaries. --- libs/vkd3d-shader/hlsl.y | 16 ++++++++++++++++ tests/hlsl/ternary.shader_test | 8 ++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 12c955f2..c308916e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4120,6 +4120,22 @@ static bool add_ternary(struct hlsl_ctx *ctx, struct hlsl_block *block, common_type = hlsl_get_numeric_type(ctx, cond_type->class, common_type->base_type, cond_type->dimx, cond_type->dimy); } + else if (cond_type->dimx != common_type->dimx || cond_type->dimy != common_type->dimy) + { + /* This condition looks wrong but is correct. + * floatN is compatible with float1xN, but not with floatNx1. */ + + struct vkd3d_string_buffer *cond_string, *value_string; + + cond_string = hlsl_type_to_string(ctx, cond_type); + value_string = hlsl_type_to_string(ctx, common_type); + if (cond_string && value_string) + hlsl_error(ctx, &first->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Ternary condition type '%s' is not compatible with value type '%s'.", + cond_string->buffer, value_string->buffer); + hlsl_release_string_buffer(ctx, cond_string); + hlsl_release_string_buffer(ctx, value_string); + } if (!(first = add_implicit_conversion(ctx, block, first, common_type, &first->loc))) return false; diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test index 5f38d896..902d2e11 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -124,7 +124,7 @@ probe all rgba (5.0, 6.0, 7.0, 1.0) % * the result operands are scalar; % * one is a typeN and the other is a type1xN -[pixel shader fail todo] +[pixel shader fail] uniform float4 cond; uniform float2x2 a, b; @@ -135,7 +135,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] uniform float2x2 cond; uniform float4 a, b; @@ -162,7 +162,7 @@ draw quad probe all rgba (1.0, 6.0, 7.0, 4.0) -[pixel shader fail todo] +[pixel shader fail] uniform float3 cond; uniform float4 a, b; @@ -174,7 +174,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] uniform float4 cond; uniform float4x1 a, b;

1 0

Giovanni Mascellani : vkd3d-shader/spirv: Normalise the shader before allocating registers.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 1d45b7a4220800f1f4ad72096d8dc9a9f20a442a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1d45b7a4220800f1f4ad72096d8dc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 17 14:07:27 2024 +0100 vkd3d-shader/spirv: Normalise the shader before allocating registers. So registers are allocated after normalisation (which could require additional registers). --- libs/vkd3d-shader/spirv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 74db0c45..e8068f3a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9680,6 +9680,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, enum vkd3d_result result = VKD3D_OK; unsigned int i; + if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0) + return result; + if (parser->shader_desc.temp_count) spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count); if (parser->shader_desc.ssa_count) @@ -9690,9 +9693,6 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, compiler->location.column = 0; compiler->location.line = 1; - if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0) - return result; - if (parser->shader_desc.block_count && !spirv_compiler_init_blocks(compiler, parser->shader_desc.block_count)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate that structured CF does not appear in block-based shaders.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 17f4afc2b55b45911005c718068810682dd6908f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/17f4afc2b55b45911005c71806881… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 12 09:28:14 2024 +0100 vkd3d-shader/ir: Validate that structured CF does not appear in block-based shaders. --- libs/vkd3d-shader/ir.c | 70 ++++++++++++++++++++++++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 64 insertions(+), 8 deletions(-)

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate LABEL registers.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: dd1b2feec09e606c589937494813807440fe49a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dd1b2feec09e606c5899374948138… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Dec 22 14:36:30 2023 +0100 vkd3d-shader/ir: Validate LABEL registers. --- libs/vkd3d-shader/ir.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c906e027..49d58053 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2484,6 +2484,37 @@ static void vsir_validate_register(struct validation_context *ctx, break; } + case VKD3DSPR_LABEL: + if (reg->precision != VKD3D_SHADER_REGISTER_PRECISION_DEFAULT) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION, "Invalid precision %#x for a LABEL register.", + reg->precision); + + if (reg->data_type != VKD3D_DATA_UINT) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE, "Invalid data type %#x for a LABEL register.", + reg->data_type); + + if (reg->dimension != VSIR_DIMENSION_NONE) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, "Invalid dimension %#x for a LABEL register.", + reg->dimension); + + if (reg->idx_count != 1) + { + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a LABEL register.", + reg->idx_count); + break; + } + + if (reg->idx[0].rel_addr) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a LABEL register."); + + /* Index == 0 is invalid, but it is temporarily allowed + * for intermediate stages. Once we support validation + * dialects we can selectively check for that. */ + if (reg->idx[0].offset > ctx->parser->shader_desc.block_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "LABEL register index %u exceeds the maximum count %u.", + reg->idx[0].offset, ctx->parser->shader_desc.block_count); + break; + case VKD3DSPR_NULL: if (reg->idx_count != 0) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a NULL register.",

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate LABEL instructions.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: bc9db34cdc8708c028062942a67511ee5d337e73 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bc9db34cdc8708c028062942a6751… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Dec 22 15:58:55 2023 +0100 vkd3d-shader/ir: Validate LABEL instructions. --- libs/vkd3d-shader/ir.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 49d58053..a4bea461 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2846,6 +2846,16 @@ static void vsir_validate_instruction(struct validation_context *ctx) --ctx->depth; break; + case VKD3DSIH_LABEL: + vsir_validate_cf_type(ctx, instruction, CF_TYPE_BLOCKS); + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 1); + if (instruction->src_count >= 1 && !vsir_register_is_label(&instruction->src[0].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid register of type %#x in a LABEL instruction, expected LABEL.", + instruction->src[0].reg.type); + break; + default: break; }

1 0