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/hlsl: Pass an hlsl_block pointer to add_array_access().

Browse Source
This commit is contained in:
Zebediah Figura 2022-11-14 20:30:28 -06:00 committed by Alexandre Julliard
parent c861a937e8
commit 21d5ee4df2
Notes: Alexandre Julliard 2023-07-27 21:40:55 +09: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/284
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -722,7 +722,7 @@ static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, str
enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2,
const struct vkd3d_shader_location *loc); const struct vkd3d_shader_location *loc);
static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, static bool add_array_access(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *array,
struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc)
{ {
const struct hlsl_type *expr_type = array->data_type, *index_type = index->data_type; const struct hlsl_type *expr_type = array->data_type, *index_type = index->data_type;
@ -745,13 +745,13 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h
return false; return false;
} }
if (!(index = add_implicit_conversion(ctx, instrs, index, if (!(index = add_implicit_conversion(ctx, block_to_list(block), index,
hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count), &index->loc))) hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count), &index->loc)))
return false; return false;
if (!(return_index = hlsl_new_index(ctx, array, index, loc))) if (!(return_index = hlsl_new_index(ctx, array, index, loc)))
return false; return false;
list_add_tail(instrs, &return_index->entry); hlsl_block_add_instr(block, return_index);
return true; return true;
} }
@ -764,7 +764,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h
if (!(cast = hlsl_new_cast(ctx, index, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) if (!(cast = hlsl_new_cast(ctx, index, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc)))
return false; return false;
list_add_tail(instrs, &cast->entry); hlsl_block_add_instr(block, cast);
index = cast; index = cast;
if (expr_type->class != HLSL_CLASS_ARRAY && expr_type->class != HLSL_CLASS_VECTOR && expr_type->class != HLSL_CLASS_MATRIX) if (expr_type->class != HLSL_CLASS_ARRAY && expr_type->class != HLSL_CLASS_VECTOR && expr_type->class != HLSL_CLASS_MATRIX)
@ -778,7 +778,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h
if (!(return_index = hlsl_new_index(ctx, array, index, loc))) if (!(return_index = hlsl_new_index(ctx, array, index, loc)))
return false; return false;
list_add_tail(instrs, &return_index->entry); hlsl_block_add_instr(block, return_index);
return true; return true;
} }
@ -6165,7 +6165,7 @@ postfix_expr:
hlsl_block_add_block($3, $1); hlsl_block_add_block($3, $1);
destroy_block($1); destroy_block($1);
if (!add_array_access(ctx, block_to_list($3), array, index, &@2)) if (!add_array_access(ctx, $3, array, index, &@2))
{ {
destroy_block($3); destroy_block($3);
YYABORT; YYABORT;