wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Use lower_ir() for lower_int_abs().

Browse Source
This commit is contained in:
Zebediah Figura
2023-06-25 19:06:45 -05:00
committed by Alexandre Julliard
parent 7944ee9bed
commit ecd781e809
Notes: Alexandre Julliard 2023-09-25 22:28:00 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/334
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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); 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_type *type = instr->data_type;
struct hlsl_ir_node *arg, *neg; struct hlsl_ir_node *arg, *neg, *max;
struct hlsl_ir_expr *expr; struct hlsl_ir_expr *expr;
if (instr->type != HLSL_IR_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))) if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg, &instr->loc)))
return false; return false;
list_add_before(&instr->entry, &neg->entry); hlsl_block_add_instr(block, neg);
expr->op = HLSL_OP2_MAX; if (!(max = hlsl_new_binary_expr(ctx, HLSL_OP2_MAX, arg, neg)))
hlsl_src_from_node(&expr->operands[1], neg); return false;
hlsl_block_add_instr(block, max);
return true; 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_dot, body);
lower_ir(ctx, lower_int_division, body); lower_ir(ctx, lower_int_division, body);
lower_ir(ctx, lower_int_modulus, 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); lower_ir(ctx, lower_float_modulus, body);
hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL);
do do