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/hlsl: Return a hlsl_block from the "loop_statement" rule.

Browse Source
This commit is contained in:
Zebediah Figura 2022-11-14 19:10:38 -06:00 committed by Alexandre Julliard
parent 23ff83e8a0
commit 79dd9544b7
Notes: Alexandre Julliard 2023-07-05 22:36:51 +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/258
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -486,7 +486,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att
return false; return false;
} }
static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct list *init, struct list *cond, static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type,
const struct parse_attribute_list *attributes, struct list *init, struct list *cond,
struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc)
{ {
struct hlsl_ir_node *loop; struct hlsl_ir_node *loop;
@ -542,7 +543,7 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const
vkd3d_free(cond); vkd3d_free(cond);
destroy_block(body); destroy_block(body);
return init; return list_to_block(init);
oom: oom:
destroy_instr_list(init); destroy_instr_list(init);
@ -4571,7 +4572,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <list> jump_statement %type <list> jump_statement
%type <list> logicand_expr %type <list> logicand_expr
%type <list> logicor_expr %type <list> logicor_expr
%type <list> loop_statement
%type <list> mul_expr %type <list> mul_expr
%type <list> postfix_expr %type <list> postfix_expr
%type <list> primary_expr %type <list> primary_expr
@ -4599,6 +4599,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <attr_list> attribute_list_optional %type <attr_list> attribute_list_optional
%type <block> compound_statement %type <block> compound_statement
%type <block> loop_statement
%type <block> statement %type <block> statement
%type <block> statement_list %type <block> statement_list
@ -5932,9 +5933,6 @@ statement:
$$ = list_to_block($1); $$ = list_to_block($1);
} }
| loop_statement | loop_statement
{
$$ = list_to_block($1);
}
jump_statement: jump_statement:
KW_RETURN expr ';' KW_RETURN expr ';'