January 2024 - Wine-commits

Rémi Bernon : include: Add more HID digitizer usage definitions.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: wine Branch: master Commit: aaf34e3f7e34be54e5645de97f8318071a620ded URL: https://gitlab.winehq.org/wine/wine/-/commit/aaf34e3f7e34be54e5645de97f8318… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 31 22:07:02 2022 +0200 include: Add more HID digitizer usage definitions. --- include/hidusage.h | 2 ++ include/wine/hid.h | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index 2ea3784d626..58ae5aab3e6 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -31,6 +31,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) #define HID_USAGE_DIGITIZER_TOUCH_SCREEN ((USAGE) 0x04) #define HID_USAGE_DIGITIZER_TOUCH_PAD ((USAGE) 0x05) +#define HID_USAGE_DIGITIZER_FINGER ((USAGE) 0x22) #define HID_USAGE_DIGITIZER_TIP_PRESSURE ((USAGE) 0x30) #define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) #define HID_USAGE_DIGITIZER_X_TILT ((USAGE) 0x3D) @@ -38,6 +39,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_DIGITIZER_AZIMUTH ((USAGE) 0x3F) #define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) #define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) +#define HID_USAGE_DIGITIZER_CONFIDENCE ((USAGE) 0x47) #define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01) #define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02) diff --git a/include/wine/hid.h b/include/wine/hid.h index 6a92317551f..8200ca9beec 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -117,6 +117,18 @@ struct hid_preparsed_data #define HID_FEATURE_VALUE_CAPS(d) ((d)->value_caps + (d)->feature_caps_start) #define HID_COLLECTION_NODES(d) (struct hid_collection_node *)((char *)(d)->value_caps + (d)->caps_size) + +/* Wine-specific Digitizer page usages, not declared in hidusage.h */ +/* From HID Usage Tables */ +/* https://usb.org/sites/default/files/hut1_22.pdf */ +#define HID_USAGE_DIGITIZER_WIDTH ((USAGE) 0x48) +#define HID_USAGE_DIGITIZER_HEIGHT ((USAGE) 0x49) +#define HID_USAGE_DIGITIZER_CONTACT_ID ((USAGE) 0x51) +#define HID_USAGE_DIGITIZER_CONTACT_COUNT ((USAGE) 0x54) +#define HID_USAGE_DIGITIZER_CONTACT_COUNT_MAX ((USAGE) 0x55) +#define HID_USAGE_DIGITIZER_SCAN_TIME ((USAGE) 0x56) + + /* Wine-specific Physical Interface Device usages */ /* From USB Device Class Definition for Physical Interface Devices */ /* https://www.usb.org/sites/default/files/documents/pid1_01.pdf */

1 0

Rémi Bernon : dinput/tests: Add a test with a virtual HID touch screen.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: wine Branch: master Commit: 4f95ad1ad13062452bac2423e0840c0d2ab1844d URL: https://gitlab.winehq.org/wine/wine/-/commit/4f95ad1ad13062452bac2423e0840c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 16 18:01:32 2023 +0100 dinput/tests: Add a test with a virtual HID touch screen. --- dlls/dinput/tests/device8.c | 270 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+)

1 0

Martin Storsjö : ntdll: Fix KiUserCallbackDispatcher on arm.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: wine Branch: master Commit: f6b66e4f87649740f91805f11277fb3c4d172e94 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6b66e4f87649740f91805f11277fb… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Jan 23 15:21:20 2024 +0200 ntdll: Fix KiUserCallbackDispatcher on arm. This was broken in 78c2b7dfe2f2d5d76400564be547fd8287d62d67. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 78db61fc764..428742b116b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -592,7 +592,7 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, "mrc p15, 0, r3, c13, c0, 2\n\t" /* NtCurrentTeb() */ "ldr r3, [r3, 0x30]\n\t" /* peb */ "ldr r3, [r3, 0x2c]\n\t" /* peb->KernelCallbackTable */ - "ldr ip, [r3, r2, lsl #3]\n\t" + "ldr ip, [r3, r2, lsl #2]\n\t" "blx ip\n\t" ".seh_handler " __ASM_NAME("user_callback_handler") ", %except\n\t" #else

1 0

Brendan McGrath : gdi32: Ignore Datatype when StartDoc is called.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: wine Branch: master Commit: 9b02ac6d42d4aea5300e228c799b329d505088fb URL: https://gitlab.winehq.org/wine/wine/-/commit/9b02ac6d42d4aea5300e228c799b32… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Thu Jan 18 12:43:28 2024 +1100 gdi32: Ignore Datatype when StartDoc is called. --- dlls/gdi32/dc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5f79150cb93..87335469b9b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2444,8 +2444,8 @@ INT WINAPI StartDocW( HDC hdc, const DOCINFOW *doc ) info.cbSize = sizeof(info); } - TRACE("DocName %s, Output %s, Datatype %s, fwType %#lx\n", - debugstr_w(info.lpszDocName), debugstr_w(info.lpszOutput), + TRACE("Size: %d, DocName %s, Output %s, Datatype %s, fwType %#lx\n", + info.cbSize, debugstr_w(info.lpszDocName), debugstr_w(info.lpszOutput), debugstr_w(info.lpszDatatype), info.fwType); if (!(dc_attr = get_dc_attr( hdc ))) return SP_ERROR; @@ -2461,22 +2461,22 @@ INT WINAPI StartDocW( HDC hdc, const DOCINFOW *doc ) output = StartDocDlgW( print->printer, &info ); if (output) info.lpszOutput = output; - if (!info.lpszDatatype || !wcsicmp(info.lpszDatatype, L"EMF")) + if (info.lpszDatatype && wcsicmp(info.lpszDatatype, L"EMF")) + FIXME("Ignoring DataType %s and forcing EMF\n", debugstr_w(info.lpszDatatype)); + + spool_info.pDocName = (WCHAR *)info.lpszDocName; + spool_info.pOutputFile = (WCHAR *)info.lpszOutput; + spool_info.pDatatype = (WCHAR *)L"NT EMF 1.003"; + if ((ret = StartDocPrinterW( print->printer, 1, (BYTE *)&spool_info ))) { - spool_info.pDocName = (WCHAR *)info.lpszDocName; - spool_info.pOutputFile = (WCHAR *)info.lpszOutput; - spool_info.pDatatype = (WCHAR *)L"NT EMF 1.003"; - if ((ret = StartDocPrinterW( print->printer, 1, (BYTE *)&spool_info ))) + if (!spool_start_doc( dc_attr, print->printer, &info )) { - if (!spool_start_doc( dc_attr, print->printer, &info )) - { - AbortDoc( hdc ); - ret = 0; - } - HeapFree( GetProcessHeap(), 0, output ); - print->flags |= CALL_START_PAGE; - return ret; + AbortDoc( hdc ); + ret = 0; } + HeapFree( GetProcessHeap(), 0, output ); + print->flags |= CALL_START_PAGE; + return ret; } }

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic Binary.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: b3903636f75e25d97f492acc9dfaca366578f167 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b3903636f75e25d97f492acc9dfac… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jan 18 16:29:48 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic Binary. --- libs/vkd3d-shader/dxil.c | 47 +++++++++++++++++++++++++++ tests/hlsl/arithmetic-int-uniform.shader_test | 6 ++-- tests/hlsl/clamp.shader_test | 2 +- tests/hlsl/max.shader_test | 4 +-- 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index b128b41f..48664b5a 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -342,6 +342,12 @@ enum dx_intrinsic_opcode DX_FIRST_BIT_LO = 32, DX_FIRST_BIT_HI = 33, DX_FIRST_BIT_SHI = 34, + DX_FMAX = 35, + DX_FMIN = 36, + DX_IMAX = 37, + DX_IMIN = 38, + DX_UMAX = 39, + DX_UMIN = 40, DX_CREATE_HANDLE = 57, DX_CBUFFER_LOAD_LEGACY = 59, DX_BUFFER_LOAD = 68, @@ -3546,6 +3552,41 @@ static void sm6_parser_emit_dx_unary(struct sm6_parser *sm6, enum dx_intrinsic_o instruction_dst_param_init_ssa_scalar(ins, sm6); } +static enum vkd3d_shader_opcode map_dx_binary_op(enum dx_intrinsic_opcode op, const struct sm6_type *type) +{ + switch (op) + { + case DX_FMAX: + return type->u.width == 64 ? VKD3DSIH_DMAX : VKD3DSIH_MAX; + case DX_FMIN: + return type->u.width == 64 ? VKD3DSIH_DMIN : VKD3DSIH_MIN; + case DX_IMAX: + return VKD3DSIH_IMAX; + case DX_IMIN: + return VKD3DSIH_IMIN; + case DX_UMAX: + return VKD3DSIH_UMAX; + case DX_UMIN: + return VKD3DSIH_UMIN; + default: + vkd3d_unreachable(); + } +} + +static void sm6_parser_emit_dx_binary(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_params; + + vsir_instruction_init(ins, &sm6->p.location, map_dx_binary_op(op, operands[0]->type)); + src_params = instruction_src_params_alloc(ins, 2, sm6); + src_param_init_from_value(&src_params[0], operands[0]); + src_param_init_from_value(&src_params[1], operands[1]); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -3793,7 +3834,11 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_FIRST_BIT_HI ] = {"i", "m", sm6_parser_emit_dx_unary}, [DX_FIRST_BIT_LO ] = {"i", "m", sm6_parser_emit_dx_unary}, [DX_FIRST_BIT_SHI ] = {"i", "m", sm6_parser_emit_dx_unary}, + [DX_FMAX ] = {"g", "RR", sm6_parser_emit_dx_binary}, + [DX_FMIN ] = {"g", "RR", sm6_parser_emit_dx_binary}, [DX_FRC ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_IMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, + [DX_IMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_LEGACY_F16TOF32 ] = {"f", "i", sm6_parser_emit_dx_unary}, [DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary}, [DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, @@ -3805,6 +3850,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output}, + [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, + [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, }; static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struct sm6_value *value, char info_type, diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test index bb83eb76..fe6ad7e9 100644 --- a/tests/hlsl/arithmetic-int-uniform.shader_test +++ b/tests/hlsl/arithmetic-int-uniform.shader_test @@ -98,7 +98,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 -7.0 0.0 -10.0 -todo(sm>=6) draw quad +draw quad probe all rgba (5.0, 7.0, 0.0, 10.0) [pixel shader] @@ -194,5 +194,5 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 5000000000 -7000000000 -todo draw quad -probe all rgba (5.0, 7.0, 0.0, 0.0) +draw quad +probe all rgba (5.0e9, 7.0e9, 0.0, 0.0) diff --git a/tests/hlsl/clamp.shader_test b/tests/hlsl/clamp.shader_test index 3d797ec3..40d0294b 100644 --- a/tests/hlsl/clamp.shader_test +++ b/tests/hlsl/clamp.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.3 -0.1 0.7 0.0 -todo(sm>=6) draw quad +draw quad probe all rgba (-0.1, 0.7, -0.3, 0.3) diff --git a/tests/hlsl/max.shader_test b/tests/hlsl/max.shader_test index e2763df4..09f4a882 100644 --- a/tests/hlsl/max.shader_test +++ b/tests/hlsl/max.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 -todo(sm>=6) draw quad +draw quad probe all rgba (0.7, 2.1, 2.0, -1.0) @@ -24,7 +24,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.4 0.8 -todo(sm>=6) draw quad +draw quad probe all rgba (0.7, 0.8, 0.7, 0.2)

1 0

Conor McCarthy : vkd3d-shader/ir: Refactor return code checking in vkd3d_shader_normalise().
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 6df725718a8ad0bd855703cdc757dd10b52e546d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6df725718a8ad0bd855703cdc757d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 16 17:35:04 2024 +1000 vkd3d-shader/ir: Refactor return code checking in vkd3d_shader_normalise(). We started with only one or two of these but it has become excessive. Patch originally written by Conor McCarthy and updated by Giovanni Mascellani. --- libs/vkd3d-shader/ir.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index fb7982a3..d1055a05 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2260,38 +2260,43 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if (parser->shader_desc.is_dxil) return result; - if (parser->program.shader_version.type != VKD3D_SHADER_TYPE_PIXEL - && (result = remap_output_signature(parser, compile_info)) < 0) - return result; + if (parser->program.shader_version.type != VKD3D_SHADER_TYPE_PIXEL) + { + if ((result = remap_output_signature(parser, compile_info)) < 0) + return result; + } - if (parser->program.shader_version.type == VKD3D_SHADER_TYPE_HULL - && (result = instruction_array_flatten_hull_shader_phases(instructions)) >= 0) + if (parser->program.shader_version.type == VKD3D_SHADER_TYPE_HULL) { - result = instruction_array_normalise_hull_shader_control_point_io(instructions, - &parser->shader_desc.input_signature); + if ((result = instruction_array_flatten_hull_shader_phases(instructions)) < 0) + return result; + + if ((result = instruction_array_normalise_hull_shader_control_point_io(instructions, + &parser->shader_desc.input_signature)) < 0) + return result; } - if (result >= 0) - result = shader_normalise_io_registers(parser); - if (result >= 0) - result = instruction_array_normalise_flat_constants(&parser->program); + if ((result = shader_normalise_io_registers(parser)) < 0) + return result; - if (result >= 0) - remove_dead_code(&parser->program); + if ((result = instruction_array_normalise_flat_constants(&parser->program)) < 0) + return result; - if (result >= 0) - result = flatten_control_flow_constructs(parser); + remove_dead_code(&parser->program); - if (result >= 0) - result = normalise_combined_samplers(parser); + if ((result = flatten_control_flow_constructs(parser)) < 0) + return result; - if (result >= 0 && TRACE_ON()) + if ((result = normalise_combined_samplers(parser)) < 0) + return result; + + if (TRACE_ON()) vkd3d_shader_trace(&parser->program); - if (result >= 0 && !parser->failed) - result = vsir_validate(parser); + if (!parser->failed && (result = vsir_validate(parser)) < 0) + return result; - if (result >= 0 && parser->failed) + if (parser->failed) result = VKD3D_ERROR_INVALID_SHADER; return result;

1 0

Giovanni Mascellani : vkd3d-shader/ir: Run tracing and validation for DXIL code too.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 4b869f73bbefcfc1bc0420e565d012967f4b38ce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b869f73bbefcfc1bc0420e565d01… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 18 12:55:09 2024 +0100 vkd3d-shader/ir: Run tracing and validation for DXIL code too. --- libs/vkd3d-shader/ir.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index d1055a05..c1400ba6 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2257,38 +2257,38 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction_array *instructions = &parser->program.instructions; enum vkd3d_result result = VKD3D_OK; - if (parser->shader_desc.is_dxil) - return result; - - if (parser->program.shader_version.type != VKD3D_SHADER_TYPE_PIXEL) + if (!parser->shader_desc.is_dxil) { - if ((result = remap_output_signature(parser, compile_info)) < 0) - return result; - } + if (parser->program.shader_version.type != VKD3D_SHADER_TYPE_PIXEL) + { + if ((result = remap_output_signature(parser, compile_info)) < 0) + return result; + } - if (parser->program.shader_version.type == VKD3D_SHADER_TYPE_HULL) - { - if ((result = instruction_array_flatten_hull_shader_phases(instructions)) < 0) - return result; + if (parser->program.shader_version.type == VKD3D_SHADER_TYPE_HULL) + { + if ((result = instruction_array_flatten_hull_shader_phases(instructions)) < 0) + return result; - if ((result = instruction_array_normalise_hull_shader_control_point_io(instructions, - &parser->shader_desc.input_signature)) < 0) - return result; - } + if ((result = instruction_array_normalise_hull_shader_control_point_io(instructions, + &parser->shader_desc.input_signature)) < 0) + return result; + } - if ((result = shader_normalise_io_registers(parser)) < 0) - return result; + if ((result = shader_normalise_io_registers(parser)) < 0) + return result; - if ((result = instruction_array_normalise_flat_constants(&parser->program)) < 0) - return result; + if ((result = instruction_array_normalise_flat_constants(&parser->program)) < 0) + return result; - remove_dead_code(&parser->program); + remove_dead_code(&parser->program); - if ((result = flatten_control_flow_constructs(parser)) < 0) - return result; + if ((result = flatten_control_flow_constructs(parser)) < 0) + return result; - if ((result = normalise_combined_samplers(parser)) < 0) - return result; + if ((result = normalise_combined_samplers(parser)) < 0) + return result; + } if (TRACE_ON()) vkd3d_shader_trace(&parser->program);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Remove DCL_TEMPS instructions.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: de9725b6bab56660439774a110fdf44a1882ff97 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/de9725b6bab56660439774a110fdf… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 18 13:05:24 2024 +0100 vkd3d-shader/ir: Remove DCL_TEMPS instructions. We have to do work to keep it updated across passes and we never read it. --- libs/vkd3d-shader/ir.c | 57 +++++++++++++++-------------------------------- libs/vkd3d-shader/spirv.c | 1 - 2 files changed, 18 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c1400ba6..719a153f 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -47,6 +47,19 @@ static void vkd3d_shader_instruction_make_nop(struct vkd3d_shader_instruction *i vsir_instruction_init(ins, &location, VKD3DSIH_NOP); } +static void remove_dcl_temps(struct vsir_program *program) +{ + unsigned int i; + + for (i = 0; i < program->instructions.count; ++i) + { + struct vkd3d_shader_instruction *ins = &program->instructions.elements[i]; + + if (ins->handler_idx == VKD3DSIH_DCL_TEMPS) + vkd3d_shader_instruction_make_nop(ins); + } +} + static void shader_register_eliminate_phase_addressing(struct vkd3d_shader_register *reg, unsigned int instance_id) { @@ -154,9 +167,6 @@ struct hull_flattener { struct vkd3d_shader_instruction_array instructions; - unsigned int max_temp_count; - unsigned int temp_dcl_idx; - unsigned int instance_count; unsigned int phase_body_idx; enum vkd3d_shader_opcode phase; @@ -214,21 +224,6 @@ static void flattener_eliminate_phase_related_dcls(struct hull_flattener *normal vkd3d_shader_instruction_make_nop(ins); return; } - else if (ins->handler_idx == VKD3DSIH_DCL_TEMPS && normaliser->phase != VKD3DSIH_INVALID) - { - /* Leave only the first temp declaration and set it to the max count later. */ - if (!normaliser->max_temp_count) - { - normaliser->max_temp_count = ins->declaration.count; - normaliser->temp_dcl_idx = index; - } - else - { - normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count); - vkd3d_shader_instruction_make_nop(ins); - } - return; - } if (normaliser->phase == VKD3DSIH_INVALID || shader_instruction_is_dcl(ins)) return; @@ -382,9 +377,6 @@ static enum vkd3d_result instruction_array_flatten_hull_shader_phases(struct vkd if (flattener.phase != VKD3DSIH_INVALID) { - if (flattener.temp_dcl_idx) - instructions->elements[flattener.temp_dcl_idx].declaration.count = flattener.max_temp_count; - if (!shader_instruction_array_reserve(&flattener.instructions, flattener.instructions.count + 1)) return VKD3D_ERROR_OUT_OF_MEMORY; vsir_instruction_init(&instructions->elements[instructions->count++], &flattener.last_ret_location, VKD3DSIH_RET); @@ -581,9 +573,6 @@ struct io_normaliser struct shader_signature *output_signature; struct shader_signature *patch_constant_signature; - unsigned int max_temp_count; - unsigned int temp_dcl_idx; - unsigned int instance_count; unsigned int phase_body_idx; enum vkd3d_shader_opcode phase; @@ -2257,6 +2246,8 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction_array *instructions = &parser->program.instructions; enum vkd3d_result result = VKD3D_OK; + remove_dcl_temps(&parser->program); + if (!parser->shader_desc.is_dxil) { if (parser->program.shader_version.type != VKD3D_SHADER_TYPE_PIXEL) @@ -2309,7 +2300,6 @@ struct validation_context size_t instruction_idx; bool invalid_instruction_idx; bool dcl_temps_found; - unsigned int temp_count; enum vkd3d_shader_opcode phase; enum cf_type { @@ -2371,11 +2361,7 @@ static void vsir_validate_src_param(struct validation_context *ctx, static void vsir_validate_register(struct validation_context *ctx, const struct vkd3d_shader_register *reg) { - unsigned int i, temp_count = ctx->temp_count; - - /* SM1-3 shaders do not include a DCL_TEMPS instruction. */ - if (ctx->program->shader_version.major <= 3) - temp_count = ctx->program->temp_count; + unsigned int i; if (reg->type >= VKD3DSPR_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, "Invalid register type %#x.", @@ -2420,18 +2406,13 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->idx[0].rel_addr) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a TEMP register."); - if (reg->idx[0].offset >= temp_count) + if (reg->idx[0].offset >= ctx->parser->program.temp_count) { validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "TEMP register index %u exceeds the maximum count %u.", - reg->idx[0].offset, temp_count); + reg->idx[0].offset, ctx->parser->program.temp_count); break; } - /* program->temp_count might be smaller then temp_count if the - * parser made a mistake; we still don't want to overflow the - * array. */ - if (reg->idx[0].offset >= ctx->program->temp_count) - break; data = &ctx->temps[reg->idx[0].offset]; if (reg->dimension == VSIR_DIMENSION_NONE) @@ -2784,7 +2765,6 @@ static void vsir_validate_instruction(struct validation_context *ctx) instruction->handler_idx); ctx->phase = instruction->handler_idx; ctx->dcl_temps_found = false; - ctx->temp_count = 0; return; default: @@ -2852,7 +2832,6 @@ static void vsir_validate_instruction(struct validation_context *ctx) "Invalid DCL_TEMPS count %u, expected at most %u.", instruction->declaration.count, ctx->program->temp_count); ctx->dcl_temps_found = true; - ctx->temp_count = instruction->declaration.count; break; case VKD3DSIH_IF: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e837fc2e..ec9786ea 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9635,7 +9635,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_SAMPLER: - case VKD3DSIH_DCL_TEMPS: case VKD3DSIH_DCL_UAV_RAW: case VKD3DSIH_DCL_UAV_STRUCTURED: case VKD3DSIH_DCL_UAV_TYPED:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Copy some missing fields in hlsl_type_clone().
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: c18a349a3f667e6730278cdf5655f37539143b82 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c18a349a3f667e6730278cdf5655f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 30 19:04:22 2023 -0500 vkd3d-shader/hlsl: Copy some missing fields in hlsl_type_clone(). --- libs/vkd3d-shader/hlsl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a990e021..04c37498 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -953,6 +953,8 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, type->modifiers |= default_majority; type->sampler_dim = old->sampler_dim; type->is_minimum_precision = old->is_minimum_precision; + type->sample_count = old->sample_count; + switch (old->class) { case HLSL_CLASS_ARRAY: @@ -1002,11 +1004,11 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, } case HLSL_CLASS_OBJECT: - { if (type->base_type == HLSL_TYPE_TECHNIQUE) type->e.version = old->e.version; + if (old->base_type == HLSL_TYPE_TEXTURE || old->base_type == HLSL_TYPE_UAV) + type->e.resource_format = old->e.resource_format; break; - } default: break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Validate the condition data type for loops as well.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 09220edd2114cf5565f9c17434f217ebe37d60b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09220edd2114cf5565f9c17434f21… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 30 18:50:11 2023 -0500 vkd3d-shader/hlsl: Validate the condition data type for loops as well. --- libs/vkd3d-shader/hlsl.y | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 69b20973..c2e9b525 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -292,6 +292,21 @@ static bool implicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_typ return hlsl_types_are_componentwise_equal(ctx, src, dst); } +static void check_condition_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *cond) +{ + const struct hlsl_type *type = cond->data_type; + + if (type->dimx > 1 || type->dimy > 1) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, &cond->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Condition type '%s' is not a scalar numeric type.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } +} + static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc) { @@ -431,6 +446,9 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct hlsl_block *co return true; condition = node_from_block(cond_block); + + check_condition_type(ctx, condition); + if (!(not = hlsl_new_unary_expr(ctx, HLSL_OP1_LOGIC_NOT, condition, &condition->loc))) return false; hlsl_block_add_instr(cond_block, not); @@ -6753,15 +6771,9 @@ selection_statement: } destroy_block($6.then_block); destroy_block($6.else_block); - if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) - { - struct vkd3d_string_buffer *string; - if ((string = hlsl_type_to_string(ctx, condition->data_type))) - hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "if condition type %s is not scalar.", string->buffer); - hlsl_release_string_buffer(ctx, string); - } + check_condition_type(ctx, condition); + $$ = $4; hlsl_block_add_instr($$, instr); }

1 0