September 2023 - Wine-Commits

Alex Henrie : regedit: Use the wcsdup function instead or reimplementing it.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: 33ce8e046d519303bc561416fb4e2078dbef8178 URL: https://gitlab.winehq.org/wine/wine/-/commit/33ce8e046d519303bc561416fb4e20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 12:24:10 2023 -0600 regedit: Use the wcsdup function instead or reimplementing it. --- programs/regedit/edit.c | 3 +-- programs/regedit/listview.c | 11 ++--------- programs/regedit/regproc.c | 11 +++-------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 947a6071e0f..b92d1c615b3 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -637,8 +637,7 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) } else { LPWSTR srcSubKey_copy; - parentPath = malloc((lstrlenW(keyPath) + 1) * sizeof(WCHAR)); - lstrcpyW(parentPath, keyPath); + parentPath = wcsdup(keyPath); srcSubKey_copy = wcsrchr(parentPath, '\\'); *srcSubKey_copy = 0; srcSubKey = srcSubKey_copy + 1; diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index c7a301929c2..757ce41855c 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -73,8 +73,7 @@ BOOL update_listview_path(const WCHAR *path) { free(g_currentPath); - g_currentPath = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)); - lstrcpyW(g_currentPath, path); + g_currentPath = wcsdup(path); return TRUE; } @@ -154,13 +153,7 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR linfo = malloc(sizeof(LINE_INFO)); linfo->dwValType = dwValType; linfo->val_len = dwCount; - - if (Name) - { - linfo->name = malloc((lstrlenW(Name) + 1) * sizeof(WCHAR)); - lstrcpyW(linfo->name, Name); - } - else linfo->name = NULL; + linfo->name = wcsdup(Name); if (ValBuf && dwCount) { diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 199cd3b6d80..15a64fdf97d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -447,10 +447,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) KEY_ALL_ACCESS, 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; @@ -699,8 +696,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; @@ -1486,8 +1482,7 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; } - class_name = malloc((lstrlenW(reg_class_namesW[i]) + 1) * sizeof(WCHAR)); - lstrcpyW(class_name, reg_class_namesW[i]); + class_name = wcsdup(reg_class_namesW[i]); export_registry_data(fp, classes[i], class_name, unicode);

1 0

Alex Henrie : reg: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

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

Alex Henrie : dxdiag: Use CRT allocation functions.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

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

Giovanni Mascellani : vkd3d-shader/ir: Remove dead code during normalisation.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: vkd3d Branch: master Commit: d9c8b49ea0260724b415b651b129a98c344f0bc4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d9c8b49ea0260724b415b651b129a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 20 22:10:39 2023 +0200 vkd3d-shader/ir: Remove dead code during normalisation. The SPIR-V backend generates invalid SPIR-V code when VSIR has dead code (except for NOPs). --- libs/vkd3d-shader/ir.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 9ee38ffe..fd09b70e 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1260,6 +1260,96 @@ static enum vkd3d_result instruction_array_normalise_flat_constants(struct vkd3d return VKD3D_OK; } +static void remove_dead_code(struct vkd3d_shader_parser *parser) +{ + size_t i, depth = 0; + bool dead = false; + + for (i = 0; i < parser->instructions.count; ++i) + { + struct vkd3d_shader_instruction *ins = &parser->instructions.elements[i]; + + switch (ins->handler_idx) + { + case VKD3DSIH_IF: + case VKD3DSIH_LOOP: + case VKD3DSIH_SWITCH: + if (dead) + { + vkd3d_shader_instruction_make_nop(ins); + ++depth; + } + break; + + case VKD3DSIH_ENDIF: + case VKD3DSIH_ENDLOOP: + case VKD3DSIH_ENDSWITCH: + case VKD3DSIH_ELSE: + if (dead) + { + if (depth > 0) + { + vkd3d_shader_instruction_make_nop(ins); + if (ins->handler_idx != VKD3DSIH_ELSE) + --depth; + } + else + { + dead = false; + } + } + break; + + /* `depth' is counted with respect to where the dead code + * segment began. So it starts at zero and it signals the + * termination of the dead code segment when it would + * become negative. */ + case VKD3DSIH_BREAK: + case VKD3DSIH_RET: + case VKD3DSIH_CONTINUE: + if (dead) + { + vkd3d_shader_instruction_make_nop(ins); + } + else + { + dead = true; + depth = 0; + } + break; + + /* If `case' or `default' appears at zero depth, it means + * that they are a possible target for the corresponding + * switch, so the code is live again. */ + case VKD3DSIH_CASE: + case VKD3DSIH_DEFAULT: + if (dead) + { + if (depth == 0) + dead = false; + else + vkd3d_shader_instruction_make_nop(ins); + } + break; + + /* Phase instructions can only appear in hull shaders and + * outside of any block. When a phase returns, control is + * moved to the following phase, so they make code live + * again. */ + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: + dead = false; + break; + + default: + if (dead) + vkd3d_shader_instruction_make_nop(ins); + break; + } + } +} + enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info) { @@ -1287,6 +1377,9 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if (result >= 0) result = instruction_array_normalise_flat_constants(parser); + if (result >= 0) + remove_dead_code(parser); + if (result >= 0 && TRACE_ON()) vkd3d_shader_trace(instructions, &parser->shader_version);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use lower_ir() for lower_sqrt().
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

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

Zebediah Figura : vkd3d-shader/hlsl: Use lower_ir() for lower_casts_to_bool().
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

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 more passes.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

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_division().
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

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_int_abs().
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

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

Petrichor Park : vkd3d-shader/hlsl: Implement intrinsic tan.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

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