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: Factor out make_empty_list().

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-02-27 18:03:12 -06:00 committed by Alexandre Julliard
parent 8d444ebbfc
commit 774609e1e2
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,15 @@ static struct hlsl_ir_node *node_from_list(struct list *list)
return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry);
} }
static struct list *make_empty_list(void)
{
struct list *list;
if ((list = vkd3d_malloc(sizeof(*list))))
list_init(list);
return list;
}
static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc) static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc)
{ {
if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK)
@ -390,9 +399,8 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l
struct hlsl_ir_loop *loop = NULL; struct hlsl_ir_loop *loop = NULL;
struct hlsl_ir_if *cond_jump = NULL; struct hlsl_ir_if *cond_jump = NULL;
if (!(list = vkd3d_malloc(sizeof(*list)))) if (!(list = make_empty_list()))
goto oom; goto oom;
list_init(list);
if (init) if (init)
list_move_head(list, init); list_move_head(list, init);
@ -724,9 +732,8 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty
if (type->type == HLSL_CLASS_MATRIX) if (type->type == HLSL_CLASS_MATRIX)
assert(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); assert(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK);
if (!(list = vkd3d_malloc(sizeof(*list)))) if (!(list = make_empty_list()))
return NULL; return NULL;
list_init(list);
LIST_FOR_EACH_ENTRY_SAFE(v, v_next, fields, struct parse_variable_def, entry) LIST_FOR_EACH_ENTRY_SAFE(v, v_next, fields, struct parse_variable_def, entry)
{ {
if (!(field = vkd3d_calloc(1, sizeof(*field)))) if (!(field = vkd3d_calloc(1, sizeof(*field))))
@ -892,12 +899,11 @@ static struct list *make_list(struct hlsl_ir_node *node)
{ {
struct list *list; struct list *list;
if (!(list = vkd3d_malloc(sizeof(*list)))) if (!(list = make_empty_list()))
{ {
hlsl_free_instr(node); hlsl_free_instr(node);
return NULL; return NULL;
} }
list_init(list);
list_add_tail(list, &node->entry); list_add_tail(list, &node->entry);
return list; return list;
} }
@ -1377,14 +1383,13 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t
if (basic_type->type == HLSL_CLASS_MATRIX) if (basic_type->type == HLSL_CLASS_MATRIX)
assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK);
if (!(statements_list = vkd3d_malloc(sizeof(*statements_list)))) if (!(statements_list = make_empty_list()))
{ {
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)
free_parse_variable_def(v); free_parse_variable_def(v);
vkd3d_free(var_list); vkd3d_free(var_list);
return NULL; return NULL;
} }
list_init(statements_list);
if (!var_list) if (!var_list)
return statements_list; return statements_list;
@ -1836,8 +1841,8 @@ any_identifier:
fields_list: fields_list:
/* empty */ /* empty */
{ {
$$ = vkd3d_malloc(sizeof(*$$)); if (!($$ = make_empty_list()))
list_init($$); YYABORT;
} }
| fields_list field | fields_list field
{ {
@ -1921,8 +1926,8 @@ func_prototype:
compound_statement: compound_statement:
'{' '}' '{' '}'
{ {
$$ = vkd3d_malloc(sizeof(*$$)); if (!($$ = make_empty_list()))
list_init($$); YYABORT;
} }
| '{' scope_start statement_list '}' | '{' scope_start statement_list '}'
{ {
@ -1982,8 +1987,8 @@ register_opt:
parameters: parameters:
scope_start scope_start
{ {
$$ = vkd3d_malloc(sizeof(*$$)); if (!($$ = make_empty_list()))
list_init($$); YYABORT;
} }
| scope_start param_list | scope_start param_list
{ {
@ -1993,8 +1998,8 @@ parameters:
param_list: param_list:
parameter parameter
{ {
$$ = vkd3d_malloc(sizeof(*$$)); if (!($$ = make_empty_list()))
list_init($$); YYABORT;
if (!add_func_parameter(ctx, $$, &$1, @1)) if (!add_func_parameter(ctx, $$, &$1, @1))
{ {
ERR("Error adding function parameter %s.\n", $1.name); ERR("Error adding function parameter %s.\n", $1.name);
@ -2148,9 +2153,8 @@ declaration_statement:
| struct_declaration | struct_declaration
| typedef | typedef
{ {
if (!($$ = vkd3d_malloc(sizeof(*$$)))) if (!($$ = make_empty_list()))
YYABORT; YYABORT;
list_init($$);
} }
typedef_type: typedef_type:
@ -2177,8 +2181,8 @@ typedef:
type_specs: type_specs:
type_spec type_spec
{ {
$$ = vkd3d_malloc(sizeof(*$$)); if (!($$ = make_empty_list()))
list_init($$); YYABORT;
list_add_head($$, &$1->entry); list_add_head($$, &$1->entry);
} }
| type_specs ',' type_spec | type_specs ',' type_spec
@ -2217,8 +2221,8 @@ variables_def_optional:
variables_def: variables_def:
variable_def variable_def
{ {
$$ = vkd3d_malloc(sizeof(*$$)); if (!($$ = make_empty_list()))
list_init($$); YYABORT;
list_add_head($$, &$1->entry); list_add_head($$, &$1->entry);
} }
| variables_def ',' variable_def | variables_def ',' variable_def
@ -2401,9 +2405,8 @@ jump_statement:
} }
| KW_RETURN ';' | KW_RETURN ';'
{ {
if (!($$ = vkd3d_malloc(sizeof(*$$)))) if (!($$ = make_empty_list()))
YYABORT; YYABORT;
list_init($$);
if (!add_return(ctx, $$, NULL, @1)) if (!add_return(ctx, $$, NULL, @1))
YYABORT; YYABORT;
} }
@ -2462,8 +2465,8 @@ loop_statement:
expr_statement: expr_statement:
';' ';'
{ {
$$ = vkd3d_malloc(sizeof(*$$)); if (!($$ = make_empty_list()))
list_init($$); YYABORT;
} }
| expr ';' | expr ';'
{ {