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

Browse Source
This commit is contained in:
Zebediah Figura 2022-11-14 20:20:16 -06:00 committed by Alexandre Julliard
parent 77e1c5893e
commit 54bd6f7b4b
Notes: Alexandre Julliard 2023-07-20 22:58:09 +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/275
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,12 +172,6 @@ static struct list *make_empty_list(struct hlsl_ctx *ctx)
return list; return list;
} }
static void destroy_instr_list(struct list *list)
{
hlsl_free_instr_list(list);
vkd3d_free(list);
}
static void destroy_block(struct hlsl_block *block) static void destroy_block(struct hlsl_block *block)
{ {
hlsl_block_cleanup(block); hlsl_block_cleanup(block);
@ -4558,7 +4552,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%token <intval> PRE_LINE %token <intval> PRE_LINE
%type <list> declaration %type <list> declaration
%type <list> declaration_statement
%type <list> struct_declaration_without_vars %type <list> struct_declaration_without_vars
%type <list> type_specs %type <list> type_specs
%type <list> variables_def %type <list> variables_def
@ -4585,6 +4578,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <block> bitxor_expr %type <block> bitxor_expr
%type <block> compound_statement %type <block> compound_statement
%type <block> conditional_expr %type <block> conditional_expr
%type <block> declaration_statement
%type <block> equality_expr %type <block> equality_expr
%type <block> expr %type <block> expr
%type <block> expr_optional %type <block> expr_optional
@ -4661,9 +4655,9 @@ hlsl_prog:
| hlsl_prog buffer_declaration buffer_body | hlsl_prog buffer_declaration buffer_body
| hlsl_prog declaration_statement | hlsl_prog declaration_statement
{ {
if (!list_empty($2)) if (!list_empty(&$2->instrs))
hlsl_fixme(ctx, &@2, "Uniform initializer."); hlsl_fixme(ctx, &@2, "Uniform initializer.");
destroy_instr_list($2); destroy_block($2);
} }
| hlsl_prog preproc_directive | hlsl_prog preproc_directive
| hlsl_prog ';' | hlsl_prog ';'
@ -5512,10 +5506,16 @@ type:
declaration_statement: declaration_statement:
declaration declaration
{
$$ = list_to_block($1);
}
| struct_declaration_without_vars | struct_declaration_without_vars
{
$$ = list_to_block($1);
}
| typedef | typedef
{ {
if (!($$ = make_empty_list(ctx))) if (!($$ = make_empty_block(ctx)))
YYABORT; YYABORT;
} }
@ -5912,9 +5912,6 @@ statement_list:
statement: statement:
declaration_statement declaration_statement
{
$$ = list_to_block($1);
}
| expr_statement | expr_statement
| compound_statement | compound_statement
| jump_statement | jump_statement