September 2023 - Wine-commits

Alex Henrie : wpcap: Use the strdup function instead of reimplementing it.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 535123c96365420d7780ed624ee0e40d3bb383ab URL: https://gitlab.winehq.org/wine/wine/-/commit/535123c96365420d7780ed624ee0e4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 11:54:03 2023 -0600 wpcap: Use the strdup function instead of reimplementing it. --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b96e940c024..6ad4fc5f04f 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -859,7 +859,7 @@ char * CDECL pcap_lookupdev( char *errbuf ) if (!ret) { if (pcap_findalldevs( &devs, errbuf ) == PCAP_ERROR || !devs) return NULL; - if ((ret = malloc( strlen(devs->name) + 1 ))) strcpy( ret, devs->name ); + ret = strdup( devs->name ); pcap_freealldevs( devs ); } return ret;

1 0

Alex Henrie : dxdiag: Use CRT allocation functions.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: f24edd9dca93fe9e43f539f3724e3625cc746984 URL: https://gitlab.winehq.org/wine/wine/-/commit/f24edd9dca93fe9e43f539f3724e36… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 12:10:13 2023 -0600 dxdiag: Use CRT allocation functions. --- programs/dxdiag/information.c | 48 ++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index 99c1a6715b2..142ee7e2ee2 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -48,12 +48,8 @@ static BOOL property_to_string(IDxDiagContainer *container, const WCHAR *propert { WCHAR *bstr = V_BSTR(&var); - *output = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(bstr) + 1) * sizeof(WCHAR)); - if (*output) - { - lstrcpyW(*output, bstr); - ret = TRUE; - } + *output = wcsdup(bstr); + ret = !!*output; } } @@ -65,24 +61,24 @@ static void free_system_information(struct dxdiag_information *dxdiag_info) { struct system_information *system_info = &dxdiag_info->system_info; - HeapFree(GetProcessHeap(), 0, system_info->szTimeEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szTimeLocalized); - HeapFree(GetProcessHeap(), 0, system_info->szMachineNameEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szOSExLongEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szOSExLocalized); - HeapFree(GetProcessHeap(), 0, system_info->szLanguagesEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szLanguagesLocalized); - HeapFree(GetProcessHeap(), 0, system_info->szSystemManufacturerEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szSystemModelEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szBIOSEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szProcessorEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szPhysicalMemoryEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szPageFileEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szPageFileLocalized); - HeapFree(GetProcessHeap(), 0, system_info->szWindowsDir); - HeapFree(GetProcessHeap(), 0, system_info->szDirectXVersionLongEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szSetupParamEnglish); - HeapFree(GetProcessHeap(), 0, system_info->szDxDiagVersion); + free(system_info->szTimeEnglish); + free(system_info->szTimeLocalized); + free(system_info->szMachineNameEnglish); + free(system_info->szOSExLongEnglish); + free(system_info->szOSExLocalized); + free(system_info->szLanguagesEnglish); + free(system_info->szLanguagesLocalized); + free(system_info->szSystemManufacturerEnglish); + free(system_info->szSystemModelEnglish); + free(system_info->szBIOSEnglish); + free(system_info->szProcessorEnglish); + free(system_info->szPhysicalMemoryEnglish); + free(system_info->szPageFileEnglish); + free(system_info->szPageFileLocalized); + free(system_info->szWindowsDir); + free(system_info->szDirectXVersionLongEnglish); + free(system_info->szSetupParamEnglish); + free(system_info->szDxDiagVersion); } static inline void fill_system_property_list(struct dxdiag_information *dxdiag_info, struct property_list *list) @@ -173,7 +169,7 @@ void free_dxdiag_information(struct dxdiag_information *system_info) for (i = 0; i < ARRAY_SIZE(filler_list); i++) filler_list[i].free_function(system_info); - HeapFree(GetProcessHeap(), 0, system_info); + free(system_info); } struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) @@ -203,7 +199,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) if (FAILED(hr)) goto error; - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); + ret = calloc(1, sizeof(*ret)); if (!ret) goto error;

1 0

Alex Henrie : reg: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 0a7084f45ad930437f28d68278ad9b9c72c0f399 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a7084f45ad930437f28d68278ad9b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 12:15:55 2023 -0600 reg: Use the wcsdup function instead of reimplementing it. --- programs/reg/import.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 6da0148ba3e..dc4bb61b683 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -377,10 +377,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) KEY_ALL_ACCESS|parser->sam, NULL, &parser->hkey, NULL); if (res == ERROR_SUCCESS) - { - parser->key_name = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)); - lstrcpyW(parser->key_name, path); - } + parser->key_name = wcsdup(path); else parser->hkey = NULL; @@ -636,8 +633,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) goto invalid; /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ - parser->value_name = malloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); - lstrcpyW(parser->value_name, val_name); + parser->value_name = wcsdup(val_name); set_state(parser, DATA_START); return p;

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX instruction LoadInput.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: vkd3d Branch: master Commit: 6ec5e5bf541ffe8f5c1933b2be7e534045d76747 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6ec5e5bf541ffe8f5c1933b2be7e5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Sep 25 23:42:44 2023 +1000 vkd3d-shader/dxil: Implement DX instruction LoadInput. --- libs/vkd3d-shader/dxil.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 3bea1362..e3a04f26 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -141,6 +141,7 @@ enum bitcode_value_symtab_code enum dx_intrinsic_opcode { + DX_LOAD_INPUT = 4, DX_STORE_OUTPUT = 5, }; @@ -305,6 +306,7 @@ struct sm6_parser size_t value_count; size_t value_capacity; size_t cur_max_value; + unsigned int ssa_next_id; struct vkd3d_shader_parser p; }; @@ -1548,6 +1550,11 @@ static inline unsigned int sm6_value_get_constant_uint(const struct sm6_value *v return register_get_uint_value(&value->u.reg); } +static unsigned int sm6_parser_alloc_ssa_id(struct sm6_parser *sm6) +{ + return sm6->ssa_next_id++; +} + static struct vkd3d_shader_src_param *instruction_src_params_alloc(struct vkd3d_shader_instruction *ins, unsigned int count, struct sm6_parser *sm6) { @@ -1580,6 +1587,13 @@ static struct vkd3d_shader_dst_param *instruction_dst_params_alloc(struct vkd3d_ return params; } +static void register_init_with_id(struct vkd3d_shader_register *reg, + enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int id) +{ + shader_register_init(reg, reg_type, data_type, 1); + reg->idx[0].offset = id; +} + static enum vkd3d_data_type vkd3d_data_type_from_sm6_type(const struct sm6_type *type) { if (type->class == TYPE_CLASS_INTEGER) @@ -1613,6 +1627,24 @@ static enum vkd3d_data_type vkd3d_data_type_from_sm6_type(const struct sm6_type return VKD3D_DATA_UINT; } +static void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const struct sm6_type *type, + struct sm6_parser *sm6) +{ + enum vkd3d_data_type data_type; + unsigned int id; + + id = sm6_parser_alloc_ssa_id(sm6); + data_type = vkd3d_data_type_from_sm6_type(sm6_type_get_scalar_type(type, 0)); + register_init_with_id(reg, VKD3DSPR_SSA, data_type, id); +} + +static void dst_param_init(struct vkd3d_shader_dst_param *param) +{ + param->write_mask = VKD3DSP_WRITEMASK_0; + param->modifiers = 0; + param->shift = 0; +} + static inline void dst_param_init_scalar(struct vkd3d_shader_dst_param *param, unsigned int component_idx) { param->write_mask = 1u << component_idx; @@ -1620,12 +1652,25 @@ static inline void dst_param_init_scalar(struct vkd3d_shader_dst_param *param, u param->shift = 0; } +static void dst_param_init_ssa_scalar(struct vkd3d_shader_dst_param *param, const struct sm6_type *type, + struct sm6_parser *sm6) +{ + dst_param_init(param); + register_init_ssa_scalar(&param->reg, type, sm6); +} + static inline void src_param_init(struct vkd3d_shader_src_param *param) { param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); param->modifiers = VKD3DSPSM_NONE; } +static void src_param_init_scalar(struct vkd3d_shader_src_param *param, unsigned int component_idx) +{ + param->swizzle = vkd3d_shader_create_swizzle(component_idx, component_idx, component_idx, component_idx); + param->modifiers = VKD3DSPSM_NONE; +} + static void src_param_init_from_value(struct vkd3d_shader_src_param *param, const struct sm6_value *src) { src_param_init(param); @@ -1654,6 +1699,16 @@ static void register_address_init(struct vkd3d_shader_register *reg, const struc } } +static void instruction_dst_param_init_ssa_scalar(struct vkd3d_shader_instruction *ins, struct sm6_parser *sm6) +{ + struct vkd3d_shader_dst_param *param = instruction_dst_params_alloc(ins, 1, sm6); + struct sm6_value *dst = sm6_parser_get_current_value(sm6); + + dst_param_init_ssa_scalar(param, dst->type, sm6); + param->write_mask = VKD3DSP_WRITEMASK_0; + dst->u.reg = param->reg; +} + /* Recurse through the block tree while maintaining a current value count. The current * count is the sum of the global count plus all declarations within the current function. * Store into value_capacity the highest count seen. */ @@ -2166,6 +2221,38 @@ static struct sm6_block *sm6_block_create() return block; } +static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, struct sm6_block *code_block, + enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct vkd3d_shader_instruction *ins) +{ + struct vkd3d_shader_src_param *src_param; + const struct shader_signature *signature; + unsigned int row_index, column_index; + const struct signature_element *e; + + row_index = sm6_value_get_constant_uint(operands[0]); + column_index = sm6_value_get_constant_uint(operands[2]); + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + + signature = &sm6->p.shader_desc.input_signature; + if (row_index >= signature->element_count) + { + WARN("Invalid row index %u.\n", row_index); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Invalid input row index %u.", row_index); + return; + } + e = &signature->elements[row_index]; + + src_param = instruction_src_params_alloc(ins, 1, sm6); + src_param->reg = sm6->input_params[row_index].reg; + src_param_init_scalar(src_param, column_index); + if (e->register_count > 1) + register_address_init(&src_param->reg, operands[1], 0, sm6); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, struct sm6_block *code_block, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct vkd3d_shader_instruction *ins) { @@ -2235,6 +2322,7 @@ struct sm6_dx_opcode_info */ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = { + [DX_LOAD_INPUT ] = {'o', "ii8i", sm6_parser_emit_dx_load_input}, [DX_STORE_OUTPUT ] = {'v', "ii8o", sm6_parser_emit_dx_store_output}, }; @@ -2887,6 +2975,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t "Out of memory allocating DXIL value array."); return VKD3D_ERROR_OUT_OF_MEMORY; } + sm6->ssa_next_id = 1; if ((ret = sm6_parser_globals_init(sm6)) < 0) { @@ -2917,6 +3006,8 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t sm6_parser_emit_output_signature(sm6, output_signature); sm6_parser_emit_input_signature(sm6, input_signature); + sm6->p.shader_desc.ssa_count = sm6->ssa_next_id; + for (i = 0; i < sm6->function_count; ++i) { if (!sm6_block_emit_instructions(sm6->functions[i].blocks[0], sm6))

1 0

Petrichor Park : vkd3d-shader/hlsl: Implement intrinsic tan.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: vkd3d Branch: master Commit: 976fd67f5192d4922e24a7830f59fcb936fa50cc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/976fd67f5192d4922e24a7830f59f… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Thu Aug 31 10:53:10 2023 -0500 vkd3d-shader/hlsl: Implement intrinsic tan. This commit also extends the trigonometry tests a little bit to make sure that tan works right. --- libs/vkd3d-shader/hlsl.y | 15 +++++++++++ tests/hlsl/trigonometry.shader_test | 50 ++++++++++++++++++++++++------------- 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fb6d485e..a47246de 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3423,6 +3423,20 @@ static bool intrinsic_step(struct hlsl_ctx *ctx, return !!add_implicit_conversion(ctx, params->instrs, ge, type, loc); } +static bool intrinsic_tan(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg = params->args[0], *sin, *cos; + + if (!(sin = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SIN, arg, loc))) + return false; + + if (!(cos = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_COS, arg, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_DIV, sin, cos, loc); +} + static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc, const char *name, enum hlsl_sampler_dim dim) { @@ -3697,6 +3711,7 @@ intrinsic_functions[] = {"smoothstep", 3, true, intrinsic_smoothstep}, {"sqrt", 1, true, intrinsic_sqrt}, {"step", 2, true, intrinsic_step}, + {"tan", 1, true, intrinsic_tan}, {"tex1D", -1, false, intrinsic_tex1D}, {"tex2D", -1, false, intrinsic_tex2D}, {"tex3D", -1, false, intrinsic_tex3D}, diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 09933d3b..f283c538 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -8,27 +8,27 @@ void main(out float tex : texcoord, inout float4 pos : sv_position) float4 main(float tex : texcoord) : sv_target { tex = floor(tex + 0.25); - return float4(sin(tex), cos(tex), 0, 0); + return float4(sin(tex), cos(tex), tan(tex), 0); } [test] draw quad -probe ( 0, 0) rgba ( 0.00000000, 1.00000000, 0.0, 0.0) -probe ( 1, 0) rgba ( 0.84147098, 0.54030231, 0.0, 0.0) 1024 -probe ( 2, 0) rgba ( 0.90929743, -0.41614684, 0.0, 0.0) 1024 -probe ( 3, 0) rgba ( 0.14112001, -0.98999250, 0.0, 0.0) 1024 -probe ( 4, 0) rgba (-0.75680250, -0.65364362, 0.0, 0.0) 1024 -probe ( 5, 0) rgba (-0.95892427, 0.28366219, 0.0, 0.0) 1024 -probe ( 6, 0) rgba (-0.27941550, 0.96017029, 0.0, 0.0) 1024 -probe ( 7, 0) rgba ( 0.65698660, 0.75390225, 0.0, 0.0) 1024 -probe ( 8, 0) rgba ( 0.98935825, -0.14550003, 0.0, 0.0) 1024 -probe ( 9, 0) rgba ( 0.41211849, -0.91113026, 0.0, 0.0) 1024 -probe (10, 0) rgba (-0.54402111, -0.83907153, 0.0, 0.0) 1024 -probe (11, 0) rgba (-0.99999021, 0.00442570, 0.0, 0.0) 2048 -probe (12, 0) rgba (-0.53657292, 0.84385396, 0.0, 0.0) 1024 -probe (13, 0) rgba ( 0.42016704, 0.90744678, 0.0, 0.0) 1024 -probe (14, 0) rgba ( 0.99060736, 0.13673722, 0.0, 0.0) 1024 -probe (15, 0) rgba ( 0.65028784, -0.75968791, 0.0, 0.0) 1024 +probe ( 0, 0) rgba ( 0.00000000, 1.00000000, 0.00000000, 0.0) +probe ( 1, 0) rgba ( 0.84147098, 0.54030231, 1.55740772, 0.0) 1024 +probe ( 2, 0) rgba ( 0.90929743, -0.41614684, -2.18503986, 0.0) 1024 +probe ( 3, 0) rgba ( 0.14112001, -0.98999250, -0.14254654, 0.0) 1024 +probe ( 4, 0) rgba (-0.75680250, -0.65364362, 1.15782128, 0.0) 1024 +probe ( 5, 0) rgba (-0.95892427, 0.28366219, -3.38051501, 0.0) 1024 +probe ( 6, 0) rgba (-0.27941550, 0.96017029, -0.29100619, 0.0) 1024 +probe ( 7, 0) rgba ( 0.65698660, 0.75390225, 0.87144798, 0.0) 1024 +probe ( 8, 0) rgba ( 0.98935825, -0.14550003, -6.79971146, 0.0) 1024 +probe ( 9, 0) rgba ( 0.41211849, -0.91113026, -0.45231566, 0.0) 1024 +probe (10, 0) rgba (-0.54402111, -0.83907153, 0.64836083, 0.0) 1024 +probe (11, 0) rgba (-0.99999021, 0.00442570, -225.95084645, 0.0) 2048 +probe (12, 0) rgba (-0.53657292, 0.84385396, -0.63585993, 0.0) 1024 +probe (13, 0) rgba ( 0.42016704, 0.90744678, 0.46302113, 0.0) 1024 +probe (14, 0) rgba ( 0.99060736, 0.13673722, 7.24460662, 0.0) 1024 +probe (15, 0) rgba ( 0.65028784, -0.75968791, -0.85599340, 0.0) 1024 [pixel shader] @@ -57,3 +57,19 @@ float4 main() : sv_target uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 draw quad probe all rgba (1000.0, 707.0, -0.0, -707.0) + + +[pixel shader] +uniform float4 a; + +float4 main() : sv_target +{ + return round(1000 * tan(a)); +} + +[test] +% tan(pi/2) is an asymtote and therefore undefined +% so check 0, pi/4, 3pi/4, pi +uniform 0 float4 0.0 0.78539816 2.35619449 3.14159265 +draw quad +probe all rgba (0, 1000, -1000.0, 0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use lower_ir() for more passes.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: vkd3d Branch: master Commit: 65bf6e997cf6bc1ef04e22dac8e63afab9da209e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/65bf6e997cf6bc1ef04e22dac8e63… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jun 25 18:46:10 2023 -0500 vkd3d-shader/hlsl: Use lower_ir() for more passes. --- libs/vkd3d-shader/hlsl_codegen.c | 130 +++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 72 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use lower_ir() for lower_casts_to_bool().
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: vkd3d Branch: master Commit: 7944ee9bedd87c7ea90ef7613266d5ff130e4fa5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7944ee9bedd87c7ea90ef7613266d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jun 25 19:03:26 2023 -0500 vkd3d-shader/hlsl: Use lower_ir() for lower_casts_to_bool(). --- libs/vkd3d-shader/hlsl_codegen.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index f48d39fd..6c298a9a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2475,11 +2475,11 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru return true; } -static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { struct hlsl_type *type = instr->data_type, *arg_type; static const struct hlsl_constant_value zero_value; - struct hlsl_ir_node *zero; + struct hlsl_ir_node *zero, *neq; struct hlsl_ir_expr *expr; if (instr->type != HLSL_IR_EXPR) @@ -2499,10 +2499,12 @@ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr zero = hlsl_new_constant(ctx, arg_type, &zero_value, &instr->loc); if (!zero) return false; - list_add_before(&instr->entry, &zero->entry); + hlsl_block_add_instr(block, zero); - expr->op = HLSL_OP2_NEQUAL; - hlsl_src_from_node(&expr->operands[1], zero); + if (!(neq = hlsl_new_binary_expr(ctx, HLSL_OP2_NEQUAL, expr->operands[0].node, zero))) + return false; + neq->data_type = expr->node.data_type; + hlsl_block_add_instr(block, neq); return true; } @@ -4388,7 +4390,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_transform_ir(ctx, split_matrix_copies, body, NULL); lower_ir(ctx, lower_narrowing_casts, body); - hlsl_transform_ir(ctx, lower_casts_to_bool, body, NULL); + lower_ir(ctx, lower_casts_to_bool, body); lower_ir(ctx, lower_int_dot, body); lower_ir(ctx, lower_int_division, body); lower_ir(ctx, lower_int_modulus, body); @@ -4406,7 +4408,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry while (progress); lower_ir(ctx, lower_nonconstant_vector_derefs, body); - hlsl_transform_ir(ctx, lower_casts_to_bool, body, NULL); + lower_ir(ctx, lower_casts_to_bool, body); lower_ir(ctx, lower_int_dot, body); hlsl_transform_ir(ctx, validate_static_object_references, body, NULL);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use lower_ir() for lower_int_abs().
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: vkd3d Branch: master Commit: ecd781e809bde4fdf58d234afed231598243ab87 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ecd781e809bde4fdf58d234afed23… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jun 25 19:06:45 2023 -0500 vkd3d-shader/hlsl: Use lower_ir() for lower_int_abs(). --- libs/vkd3d-shader/hlsl_codegen.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6c298a9a..6a2a8bc8 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2655,10 +2655,10 @@ static bool lower_int_modulus(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, return hlsl_add_conditional(ctx, block, and, neg, cast3); } -static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { struct hlsl_type *type = instr->data_type; - struct hlsl_ir_node *arg, *neg; + struct hlsl_ir_node *arg, *neg, *max; struct hlsl_ir_expr *expr; if (instr->type != HLSL_IR_EXPR) @@ -2676,10 +2676,11 @@ static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg, &instr->loc))) return false; - list_add_before(&instr->entry, &neg->entry); + hlsl_block_add_instr(block, neg); - expr->op = HLSL_OP2_MAX; - hlsl_src_from_node(&expr->operands[1], neg); + if (!(max = hlsl_new_binary_expr(ctx, HLSL_OP2_MAX, arg, neg))) + return false; + hlsl_block_add_instr(block, max); return true; } @@ -4394,7 +4395,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_int_dot, body); lower_ir(ctx, lower_int_division, body); lower_ir(ctx, lower_int_modulus, body); - hlsl_transform_ir(ctx, lower_int_abs, body, NULL); + lower_ir(ctx, lower_int_abs, body); lower_ir(ctx, lower_float_modulus, body); hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); do

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use lower_ir() for lower_division().
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: vkd3d Branch: master Commit: 496a3a2093d7455f5774d16190f0ab98c0f08e31 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/496a3a2093d7455f5774d16190f0a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jun 25 19:10:34 2023 -0500 vkd3d-shader/hlsl: Use lower_ir() for lower_division(). --- libs/vkd3d-shader/hlsl_codegen.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6a2a8bc8..23e52a25 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2268,10 +2268,10 @@ static bool sort_synthetic_separated_samplers_first(struct hlsl_ctx *ctx) } /* Lower DIV to RCP + MUL. */ -static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { + struct hlsl_ir_node *rcp, *mul; struct hlsl_ir_expr *expr; - struct hlsl_ir_node *rcp; if (instr->type != HLSL_IR_EXPR) return false; @@ -2281,10 +2281,12 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi if (!(rcp = hlsl_new_unary_expr(ctx, HLSL_OP1_RCP, expr->operands[1].node, &instr->loc))) return false; - list_add_before(&expr->node.entry, &rcp->entry); - expr->op = HLSL_OP2_MUL; - hlsl_src_remove(&expr->operands[1]); - hlsl_src_from_node(&expr->operands[1], rcp); + hlsl_block_add_instr(block, rcp); + + if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, expr->operands[0].node, rcp))) + return false; + hlsl_block_add_instr(block, mul); + return true; } @@ -4423,7 +4425,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_ternary, body); if (profile->major_version < 4) { - hlsl_transform_ir(ctx, lower_division, body, NULL); + lower_ir(ctx, lower_division, body); hlsl_transform_ir(ctx, lower_sqrt, body, NULL); lower_ir(ctx, lower_dot, body); lower_ir(ctx, lower_round, body);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use lower_ir() for lower_sqrt().
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: vkd3d Branch: master Commit: fcda20a8c38e080a4ca5e46855fdf9d786f7585a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fcda20a8c38e080a4ca5e46855fdf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jun 25 19:11:37 2023 -0500 vkd3d-shader/hlsl: Use lower_ir() for lower_sqrt(). --- libs/vkd3d-shader/hlsl_codegen.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 23e52a25..76572cf9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2291,10 +2291,10 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, str } /* Lower SQRT to RSQ + RCP. */ -static bool lower_sqrt(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +static bool lower_sqrt(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { + struct hlsl_ir_node *rsq, *rcp; struct hlsl_ir_expr *expr; - struct hlsl_ir_node *rsq; if (instr->type != HLSL_IR_EXPR) return false; @@ -2304,10 +2304,11 @@ static bool lower_sqrt(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *c if (!(rsq = hlsl_new_unary_expr(ctx, HLSL_OP1_RSQ, expr->operands[0].node, &instr->loc))) return false; - list_add_before(&expr->node.entry, &rsq->entry); - expr->op = HLSL_OP1_RCP; - hlsl_src_remove(&expr->operands[0]); - hlsl_src_from_node(&expr->operands[0], rsq); + hlsl_block_add_instr(block, rsq); + + if (!(rcp = hlsl_new_unary_expr(ctx, HLSL_OP1_RCP, rsq, &instr->loc))) + return false; + hlsl_block_add_instr(block, rcp); return true; } @@ -4426,7 +4427,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry if (profile->major_version < 4) { lower_ir(ctx, lower_division, body); - hlsl_transform_ir(ctx, lower_sqrt, body, NULL); + lower_ir(ctx, lower_sqrt, body); lower_ir(ctx, lower_dot, body); lower_ir(ctx, lower_round, body); }

1 0