wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Lower postincrement and postdecrement to assignment operations at parse time.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-03-09 19:42:48 -06:00 committed by Alexandre Julliard
parent 1cd208fb32
commit 363a4334e9
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d-shader/hlsl.c
View File

@ -983,9 +983,6 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr)
"sat", "sat",
"post++",
"post--",
"+", "+",
"-", "-",
"*", "*",

3
libs/vkd3d-shader/hlsl.h
View File

@ -276,9 +276,6 @@ enum hlsl_ir_expr_op
HLSL_IR_UNOP_SAT, HLSL_IR_UNOP_SAT,
HLSL_IR_UNOP_POSTINC,
HLSL_IR_UNOP_POSTDEC,
HLSL_IR_BINOP_ADD, HLSL_IR_BINOP_ADD,
HLSL_IR_BINOP_SUB, HLSL_IR_BINOP_SUB,
HLSL_IR_BINOP_MUL, HLSL_IR_BINOP_MUL,

53
libs/vkd3d-shader/hlsl.y
View File

@ -1348,20 +1348,39 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in
return &copy->node; return &copy->node;
} }
static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrement, struct vkd3d_shader_location loc) static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrement, bool post,
struct vkd3d_shader_location loc)
{ {
struct hlsl_ir_node *lhs = node_from_list(instrs); struct hlsl_ir_node *lhs = node_from_list(instrs);
struct hlsl_ir_constant *one; struct hlsl_ir_constant *one;
if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST) if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST)
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST,
"Argument to pre%screment operator is const.", decrement ? "de" : "in"); "Argument to %s%screment operator is const.", post ? "post" : "pre", decrement ? "de" : "in");
if (!(one = hlsl_new_uint_constant(ctx, 1, loc))) if (!(one = hlsl_new_uint_constant(ctx, 1, loc)))
return false; return false;
list_add_tail(instrs, &one->node.entry); list_add_tail(instrs, &one->node.entry);
return !!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, &one->node); if (!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, &one->node))
return false;
if (post)
{
struct hlsl_ir_expr *copy;
/* Use a cast to the same type as a makeshift identity expression. */
if (!(copy = hlsl_new_cast(lhs, lhs->data_type, &lhs->loc)))
return false;
list_add_tail(instrs, &copy->node.entry);
/* Post increment/decrement expressions are considered const. */
if (!(copy->node.data_type = hlsl_type_clone(ctx, copy->node.data_type, 0)))
return false;
copy->node.data_type->modifiers |= HLSL_MODIFIER_CONST;
}
return true;
} }
static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var,
@ -2624,33 +2643,21 @@ postfix_expr:
primary_expr primary_expr
| postfix_expr OP_INC | postfix_expr OP_INC
{ {
struct hlsl_ir_node *inc; if (!add_increment(ctx, $1, false, true, @2))
if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST)
{ {
hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); hlsl_free_instr_list($1);
YYABORT; YYABORT;
} }
inc = hlsl_new_unary_expr(HLSL_IR_UNOP_POSTINC, node_from_list($1), @2); $$ = $1;
/* Post increment/decrement expressions are considered const */
inc->data_type = hlsl_type_clone(ctx, inc->data_type, 0);
inc->data_type->modifiers |= HLSL_MODIFIER_CONST;
$$ = append_unop($1, inc);
} }
| postfix_expr OP_DEC | postfix_expr OP_DEC
{ {
struct hlsl_ir_node *inc; if (!add_increment(ctx, $1, true, true, @2))
if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST)
{ {
hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); hlsl_free_instr_list($1);
YYABORT; YYABORT;
} }
inc = hlsl_new_unary_expr(HLSL_IR_UNOP_POSTDEC, node_from_list($1), @2); $$ = $1;
/* Post increment/decrement expressions are considered const */
inc->data_type = hlsl_type_clone(ctx, inc->data_type, 0);
inc->data_type->modifiers |= HLSL_MODIFIER_CONST;
$$ = append_unop($1, inc);
} }
| postfix_expr '.' any_identifier | postfix_expr '.' any_identifier
{ {
@ -2801,7 +2808,7 @@ unary_expr:
postfix_expr postfix_expr
| OP_INC unary_expr | OP_INC unary_expr
{ {
if (!add_increment(ctx, $2, false, @1)) if (!add_increment(ctx, $2, false, false, @1))
{ {
hlsl_free_instr_list($2); hlsl_free_instr_list($2);
YYABORT; YYABORT;
@ -2810,7 +2817,7 @@ unary_expr:
} }
| OP_DEC unary_expr | OP_DEC unary_expr
{ {
if (!add_increment(ctx, $2, true, @1)) if (!add_increment(ctx, $2, true, false, @1))
{ {
hlsl_free_instr_list($2); hlsl_free_instr_list($2);
YYABORT; YYABORT;