wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Lower preincrement and predecrement 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:47 -06:00 committed by Alexandre Julliard
parent 5f66257b8b
commit 1cd208fb32
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -276,8 +276,6 @@ enum hlsl_ir_expr_op
HLSL_IR_UNOP_SAT, HLSL_IR_UNOP_SAT,
HLSL_IR_UNOP_PREINC,
HLSL_IR_UNOP_PREDEC,
HLSL_IR_UNOP_POSTINC, HLSL_IR_UNOP_POSTINC,
HLSL_IR_UNOP_POSTDEC, HLSL_IR_UNOP_POSTDEC,

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

@ -1348,6 +1348,22 @@ 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)
{
struct hlsl_ir_node *lhs = node_from_list(instrs);
struct hlsl_ir_constant *one;
if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST)
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST,
"Argument to pre%screment operator is const.", decrement ? "de" : "in");
if (!(one = hlsl_new_uint_constant(ctx, 1, loc)))
return false;
list_add_tail(instrs, &one->node.entry);
return !!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, &one->node);
}
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,
struct parse_initializer *initializer) struct parse_initializer *initializer)
{ {
@ -2785,21 +2801,21 @@ unary_expr:
postfix_expr postfix_expr
| OP_INC unary_expr | OP_INC unary_expr
{ {
if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) if (!add_increment(ctx, $2, false, @1))
{ {
hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); hlsl_free_instr_list($2);
YYABORT; YYABORT;
} }
$$ = append_unop($2, hlsl_new_unary_expr(HLSL_IR_UNOP_PREINC, node_from_list($2), @1)); $$ = $2;
} }
| OP_DEC unary_expr | OP_DEC unary_expr
{ {
if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) if (!add_increment(ctx, $2, true, @1))
{ {
hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Statement modifies a const expression."); hlsl_free_instr_list($2);
YYABORT; YYABORT;
} }
$$ = append_unop($2, hlsl_new_unary_expr(HLSL_IR_UNOP_PREDEC, node_from_list($2), @1)); $$ = $2;
} }
| unary_op unary_expr | unary_op unary_expr
{ {