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: Introduce a hlsl_new_expr() helper.

Browse Source
This commit is contained in:
Zebediah Figura
2022-09-26 19:00:09 -05:00
committed by Alexandre Julliard
parent 1e10b5e616
commit 20fc4375ad
Notes: Alexandre Julliard 2022-10-18 00:13:00 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/25
3 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1217,7 +1217,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS],
struct hlsl_type *type, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_expr *expr;
struct hlsl_ir_node *expr;
unsigned int i;
if (type->type == HLSL_CLASS_MATRIX)
@@ -1271,15 +1271,11 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
return &load->node;
}
if (!(expr = hlsl_alloc(ctx, sizeof(*expr))))
if (!(expr = hlsl_new_expr(ctx, op, operands, type, loc)))
return NULL;
init_node(&expr->node, HLSL_IR_EXPR, type, *loc);
expr->op = op;
for (i = 0; i < HLSL_MAX_OPERANDS; ++i)
hlsl_src_from_node(&expr->operands[i], operands[i]);
list_add_tail(instrs, &expr->node.entry);
list_add_tail(instrs, &expr->entry);
return &expr->node;
return expr;
}
static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr)