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 "declaration" and "struct_declaration" rules.

Browse Source
This commit is contained in:
Zebediah Figura
2022-11-14 20:22:36 -06:00
committed by Alexandre Julliard
parent 54bd6f7b4b
commit cdabe172cb
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 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2177,14 +2177,14 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v)
} }
} }
static struct list *initialize_vars(struct hlsl_ctx *ctx, struct list *var_list) static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var_list)
{ {
struct parse_variable_def *v, *v_next; struct parse_variable_def *v, *v_next;
struct list *statements_list; struct hlsl_block *initializers;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
struct hlsl_type *type; struct hlsl_type *type;
if (!(statements_list = make_empty_list(ctx))) if (!(initializers = make_empty_block(ctx)))
{ {
LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry)
{ {
@ -2239,7 +2239,7 @@ static struct list *initialize_vars(struct hlsl_ctx *ctx, struct list *var_list)
if (var->storage_modifiers & HLSL_STORAGE_STATIC) if (var->storage_modifiers & HLSL_STORAGE_STATIC)
hlsl_block_add_block(&ctx->static_initializers, v->initializer.instrs); hlsl_block_add_block(&ctx->static_initializers, v->initializer.instrs);
else else
list_move_tail(statements_list, &v->initializer.instrs->instrs); hlsl_block_add_block(initializers, v->initializer.instrs);
} }
else if (var->storage_modifiers & HLSL_STORAGE_STATIC) else if (var->storage_modifiers & HLSL_STORAGE_STATIC)
{ {
@ -2277,7 +2277,7 @@ static struct list *initialize_vars(struct hlsl_ctx *ctx, struct list *var_list)
} }
vkd3d_free(var_list); vkd3d_free(var_list);
return statements_list; return initializers;
} }
struct find_function_call_args struct find_function_call_args
@ -4551,8 +4551,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%token <intval> C_INTEGER %token <intval> C_INTEGER
%token <intval> PRE_LINE %token <intval> PRE_LINE
%type <list> declaration
%type <list> struct_declaration_without_vars
%type <list> type_specs %type <list> type_specs
%type <list> variables_def %type <list> variables_def
%type <list> variables_def_typed %type <list> variables_def_typed
@ -4578,6 +4576,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
%type <block> declaration_statement %type <block> declaration_statement
%type <block> equality_expr %type <block> equality_expr
%type <block> expr %type <block> expr
@ -4596,6 +4595,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <block> selection_statement %type <block> selection_statement
%type <block> statement %type <block> statement
%type <block> statement_list %type <block> statement_list
%type <block> struct_declaration_without_vars
%type <block> unary_expr %type <block> unary_expr
%type <boolval> boolean %type <boolval> boolean
@ -4725,7 +4725,7 @@ struct_declaration_without_vars:
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Modifiers are not allowed on struct type declarations."); "Modifiers are not allowed on struct type declarations.");
if (!($$ = make_empty_list(ctx))) if (!($$ = make_empty_block(ctx)))
YYABORT; YYABORT;
} }
@ -5506,13 +5506,7 @@ 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_block(ctx))) if (!($$ = make_empty_block(ctx)))
@ -6003,7 +5997,7 @@ loop_statement:
} }
| attribute_list_optional KW_FOR '(' scope_start declaration expr_statement expr_optional ')' statement | attribute_list_optional KW_FOR '(' scope_start declaration expr_statement expr_optional ')' statement
{ {
$$ = create_loop(ctx, LOOP_FOR, &$1, list_to_block($5), $6, $7, $9, &@2); $$ = create_loop(ctx, LOOP_FOR, &$1, $5, $6, $7, $9, &@2);
hlsl_pop_scope(ctx); hlsl_pop_scope(ctx);
} }