wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Return a hlsl_block from the "selection_statement" rule.

Browse Source
This commit is contained in:
Zebediah Figura
2022-11-14 19:12:54 -06:00
committed by Alexandre Julliard
parent 79dd9544b7
commit e4bf5933b9
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 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4576,7 +4576,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <list> postfix_expr %type <list> postfix_expr
%type <list> primary_expr %type <list> primary_expr
%type <list> relational_expr %type <list> relational_expr
%type <list> selection_statement
%type <list> shift_expr %type <list> shift_expr
%type <list> struct_declaration_without_vars %type <list> struct_declaration_without_vars
%type <list> type_specs %type <list> type_specs
@@ -4600,6 +4599,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <block> compound_statement %type <block> compound_statement
%type <block> loop_statement %type <block> loop_statement
%type <block> selection_statement
%type <block> statement %type <block> statement
%type <block> statement_list %type <block> statement_list
@@ -5929,9 +5929,6 @@ statement:
$$ = list_to_block($1); $$ = list_to_block($1);
} }
| selection_statement | selection_statement
{
$$ = list_to_block($1);
}
| loop_statement | loop_statement
jump_statement: jump_statement:
@@ -5987,8 +5984,8 @@ selection_statement:
"if condition type %s is not scalar.", string->buffer); "if condition type %s is not scalar.", string->buffer);
hlsl_release_string_buffer(ctx, string); hlsl_release_string_buffer(ctx, string);
} }
$$ = $3; $$ = list_to_block($3);
list_add_tail($$, &instr->entry); hlsl_block_add_instr($$, instr);
} }
if_body: if_body: