wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Use replace_ir() for fold_redundant_casts().

Browse Source
This commit is contained in:
Elizabeth Figura
2025-08-20 17:27:43 -05:00
committed by Henri Verbeet
parent adc8d5cfad
commit 0bfed6587a
Notes: Henri Verbeet 2025-10-09 15:57:34 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1749
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/vkd3d-shader/hlsl_codegen.c
View File

@@ -3564,7 +3564,8 @@ static bool validate_dereferences(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins
return false; return false;
} }
static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) static struct hlsl_ir_node *fold_redundant_casts(struct hlsl_ctx *ctx,
struct hlsl_ir_node *instr, struct hlsl_block *block)
{ {
if (instr->type == HLSL_IR_EXPR) if (instr->type == HLSL_IR_EXPR)
{ {
@@ -3573,20 +3574,17 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst
const struct hlsl_type *src_type; const struct hlsl_type *src_type;
if (expr->op != HLSL_OP1_CAST) if (expr->op != HLSL_OP1_CAST)
return false; return NULL;
src_type = expr->operands[0].node->data_type; src_type = expr->operands[0].node->data_type;
if (hlsl_types_are_equal(src_type, dst_type) if (hlsl_types_are_equal(src_type, dst_type)
|| (src_type->e.numeric.type == dst_type->e.numeric.type || (src_type->e.numeric.type == dst_type->e.numeric.type
&& hlsl_is_vec1(src_type) && hlsl_is_vec1(dst_type))) && hlsl_is_vec1(src_type) && hlsl_is_vec1(dst_type)))
{ return expr->operands[0].node;
hlsl_replace_node(&expr->node, expr->operands[0].node);
return true;
}
} }
return false; return NULL;
} }
/* Copy an element of a complex variable. Helper for /* Copy an element of a complex variable. Helper for
@@ -8510,7 +8508,7 @@ static void hlsl_run_folding_passes(struct hlsl_ctx *ctx, struct hlsl_block *bod
{ {
bool progress; bool progress;
hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); replace_ir(ctx, fold_redundant_casts, body);
do do
{ {
progress = simplify_exprs(ctx, body); progress = simplify_exprs(ctx, body);
@@ -8519,7 +8517,7 @@ static void hlsl_run_folding_passes(struct hlsl_ctx *ctx, struct hlsl_block *bod
progress |= replace_ir(ctx, fold_trivial_swizzles, body); progress |= replace_ir(ctx, fold_trivial_swizzles, body);
progress |= hlsl_transform_ir(ctx, remove_trivial_conditional_branches, body, NULL); progress |= hlsl_transform_ir(ctx, remove_trivial_conditional_branches, body, NULL);
} while (progress); } while (progress);
hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); replace_ir(ctx, fold_redundant_casts, body);
} }
void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body) void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body)
@@ -8530,7 +8528,7 @@ void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body)
replace_ir(ctx, lower_matrix_swizzles, body); replace_ir(ctx, lower_matrix_swizzles, body);
replace_ir(ctx, lower_broadcasts, body); replace_ir(ctx, lower_broadcasts, body);
while (hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL)); while (replace_ir(ctx, fold_redundant_casts, body));
do do
{ {
progress = hlsl_transform_ir(ctx, split_array_copies, body, NULL); progress = hlsl_transform_ir(ctx, split_array_copies, body, NULL);