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 "statement" rule.

Browse Source 
As well as from the "statement_list" and "compound_statement" rules, which
trivially pass through from "statement".
This commit is contained in:
Zebediah Figura
2022-11-14 19:07:27 -06:00
committed by Alexandre Julliard
parent 53e9ad3e4c
commit 23ff83e8a0
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 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,9 +487,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att
} }
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 list *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 list *body, const struct vkd3d_shader_location *loc) struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc)
{ {
struct hlsl_block body_block;
struct hlsl_ir_node *loop; struct hlsl_ir_node *loop;
unsigned int i; unsigned int i;
@ -529,32 +528,27 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const
if (!append_conditional_break(ctx, cond)) if (!append_conditional_break(ctx, cond))
goto oom; goto oom;
hlsl_block_init(&body_block);
if (type != LOOP_DO_WHILE)
list_move_tail(&body_block.instrs, cond);
list_move_tail(&body_block.instrs, body);
if (iter) if (iter)
list_move_tail(&body_block.instrs, iter); list_move_tail(&body->instrs, iter);
if (type == LOOP_DO_WHILE) if (type == LOOP_DO_WHILE)
list_move_tail(&body_block.instrs, cond); list_move_tail(&body->instrs, cond);
else
list_move_head(&body->instrs, cond);
if (!(loop = hlsl_new_loop(ctx, &body_block, loc))) if (!(loop = hlsl_new_loop(ctx, body, loc)))
goto oom; goto oom;
list_add_tail(init, &loop->entry); list_add_tail(init, &loop->entry);
vkd3d_free(cond); vkd3d_free(cond);
vkd3d_free(body); destroy_block(body);
return init; return init;
oom: oom:
destroy_instr_list(init); destroy_instr_list(init);
destroy_instr_list(cond); destroy_instr_list(cond);
destroy_instr_list(iter); destroy_instr_list(iter);
destroy_instr_list(body); destroy_block(body);
return NULL; return NULL;
} }
@ -4433,6 +4427,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
char *name; char *name;
DWORD modifiers; DWORD modifiers;
struct hlsl_ir_node *instr; struct hlsl_ir_node *instr;
struct hlsl_block *block;
struct list *list; struct list *list;
struct parse_fields fields; struct parse_fields fields;
struct parse_function function; struct parse_function function;
@ -4565,7 +4560,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <list> bitand_expr %type <list> bitand_expr
%type <list> bitor_expr %type <list> bitor_expr
%type <list> bitxor_expr %type <list> bitxor_expr
%type <list> compound_statement
%type <list> conditional_expr %type <list> conditional_expr
%type <list> declaration %type <list> declaration
%type <list> declaration_statement %type <list> declaration_statement
@ -4584,8 +4578,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <list> relational_expr %type <list> relational_expr
%type <list> selection_statement %type <list> selection_statement
%type <list> shift_expr %type <list> shift_expr
%type <list> statement
%type <list> statement_list
%type <list> struct_declaration_without_vars %type <list> struct_declaration_without_vars
%type <list> type_specs %type <list> type_specs
%type <list> unary_expr %type <list> unary_expr
@ -4606,6 +4598,10 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <attr_list> attribute_list %type <attr_list> attribute_list
%type <attr_list> attribute_list_optional %type <attr_list> attribute_list_optional
%type <block> compound_statement
%type <block> statement
%type <block> statement_list
%type <boolval> boolean %type <boolval> boolean
%type <buffer_type> buffer_type %type <buffer_type> buffer_type
@ -4913,15 +4909,15 @@ func_declaration:
"Function \"%s\" is already defined.", decl->func->name); "Function \"%s\" is already defined.", decl->func->name);
hlsl_note(ctx, &decl->loc, VKD3D_SHADER_LOG_ERROR, hlsl_note(ctx, &decl->loc, VKD3D_SHADER_LOG_ERROR,
"\"%s\" was previously defined here.", decl->func->name); "\"%s\" was previously defined here.", decl->func->name);
hlsl_free_instr_list($2); destroy_block($2);
} }
else else
{ {
size_t i; size_t i;
decl->has_body = true; decl->has_body = true;
list_move_tail(&decl->body.instrs, $2); hlsl_block_add_block(&decl->body, $2);
vkd3d_free($2); destroy_block($2);
/* Semantics are taken from whichever definition has a body. /* Semantics are taken from whichever definition has a body.
* We can't just replace the hlsl_ir_var pointers, though: if * We can't just replace the hlsl_ir_var pointers, though: if
@ -5098,7 +5094,7 @@ func_prototype:
compound_statement: compound_statement:
'{' '}' '{' '}'
{ {
if (!($$ = make_empty_list(ctx))) if (!($$ = make_empty_block(ctx)))
YYABORT; YYABORT;
} }
| '{' scope_start statement_list '}' | '{' scope_start statement_list '}'
@ -5913,17 +5909,32 @@ statement_list:
| statement_list statement | statement_list statement
{ {
$$ = $1; $$ = $1;
list_move_tail($$, $2); hlsl_block_add_block($$, $2);
vkd3d_free($2); destroy_block($2);
} }
statement: statement:
declaration_statement declaration_statement
{
$$ = list_to_block($1);
}
| expr_statement | expr_statement
{
$$ = list_to_block($1);
}
| compound_statement | compound_statement
| jump_statement | jump_statement
{
$$ = list_to_block($1);
}
| selection_statement | selection_statement
{
$$ = list_to_block($1);
}
| loop_statement | loop_statement
{
$$ = list_to_block($1);
}
jump_statement: jump_statement:
KW_RETURN expr ';' KW_RETURN expr ';'
@ -5985,13 +5996,13 @@ selection_statement:
if_body: if_body:
statement statement
{ {
$$.then_block = list_to_block($1); $$.then_block = $1;
$$.else_block = NULL; $$.else_block = NULL;
} }
| statement KW_ELSE statement | statement KW_ELSE statement
{ {
$$.then_block = list_to_block($1); $$.then_block = $1;
$$.else_block = list_to_block($3); $$.else_block = $3;
} }
loop_statement: loop_statement: