wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Remove instruction list parameter in struct_var_initializer().

Browse Source 
Signed-off-by: Francisco Casas <fcasas@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francisco Casas
2022-04-14 12:52:36 +02:00
committed by Alexandre Julliard
parent c3a5cd7c13
commit 7cee81cf3e
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1447,7 +1447,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem
return true; return true;
} }
static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var,
struct parse_initializer *initializer) struct parse_initializer *initializer)
{ {
struct hlsl_type *type = var->data_type; struct hlsl_type *type = var->data_type;
@@ -1459,13 +1459,9 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
"Expected %u components in initializer, but got %u.", "Expected %u components in initializer, but got %u.",
hlsl_type_component_count(type), initializer_size(initializer)); hlsl_type_component_count(type), initializer_size(initializer));
free_parse_initializer(initializer);
return; return;
} }
list_move_tail(list, initializer->instrs);
vkd3d_free(initializer->instrs);
LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry)
{ {
struct hlsl_ir_node *node = initializer->args[i]; struct hlsl_ir_node *node = initializer->args[i];
@@ -1479,19 +1475,17 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru
{ {
if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, &node->loc))) if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, &node->loc)))
break; break;
list_add_tail(list, &c->node.entry); list_add_tail(initializer->instrs, &c->node.entry);
if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc)))
break; break;
list_add_tail(list, &store->node.entry); list_add_tail(initializer->instrs, &store->node.entry);
} }
else else
{ {
hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer.");
} }
} }
vkd3d_free(initializer->args);
} }
static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type,
@@ -1649,7 +1643,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t
if (type->type == HLSL_CLASS_STRUCT) if (type->type == HLSL_CLASS_STRUCT)
{ {
struct_var_initializer(ctx, statements_list, var, &v->initializer); struct_var_initializer(ctx, var, &v->initializer);
list_move_tail(statements_list, v->initializer.instrs);
free_parse_initializer(&v->initializer);
vkd3d_free(v); vkd3d_free(v);
continue; continue;
} }