wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Treat all braceless initializers as assignments.

Browse Source 
Signed-off-by: Francisco Casas <fcasas@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@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:
Francisco Casas 2022-03-30 23:38:31 +02:00 committed by Alexandre Julliard
parent 6284cf7d57
commit a75560af3d
1 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1603,61 +1603,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t
if (v->initializer.args_count) if (v->initializer.args_count)
{ {
unsigned int size = initializer_size(&v->initializer); if (v->initializer.braces)
struct hlsl_ir_load *load;
if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces
&& type->dimx * type->dimy != size)
{ {
hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, unsigned int size = initializer_size(&v->initializer);
"Expected %u components in numeric initializer, but got %u.",
type->dimx * type->dimy, v->initializer.args_count);
free_parse_initializer(&v->initializer);
vkd3d_free(v);
continue;
}
if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size)
&& hlsl_type_component_count(type) != size) {
{ hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Expected %u components in numeric initializer, but got %u.",
"Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); type->dimx * type->dimy, v->initializer.args_count);
free_parse_initializer(&v->initializer); free_parse_initializer(&v->initializer);
vkd3d_free(v); vkd3d_free(v);
continue; continue;
} }
if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY)
{ && hlsl_type_component_count(type) != size)
FIXME("Initializers for non scalar/struct variables not supported yet.\n"); {
free_parse_initializer(&v->initializer); hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
vkd3d_free(v); "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size);
continue; free_parse_initializer(&v->initializer);
} vkd3d_free(v);
continue;
}
if (type->type == HLSL_CLASS_STRUCT) if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT)
{ {
struct_var_initializer(ctx, statements_list, var, &v->initializer); FIXME("Initializers for non scalar/struct variables not supported yet.\n");
vkd3d_free(v); free_parse_initializer(&v->initializer);
continue; vkd3d_free(v);
} continue;
if (v->initializer.args_count > 1) }
{
hlsl_fixme(ctx, &v->loc, "Complex initializer.");
free_parse_initializer(&v->initializer);
vkd3d_free(v);
continue;
}
load = hlsl_new_var_load(ctx, var, var->loc); if (type->type == HLSL_CLASS_STRUCT)
list_add_tail(v->initializer.instrs, &load->node.entry); {
add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); struct_var_initializer(ctx, statements_list, var, &v->initializer);
vkd3d_free(v->initializer.args); vkd3d_free(v);
continue;
}
else
{
hlsl_fixme(ctx, &v->loc, "Complex initializer.");
free_parse_initializer(&v->initializer);
vkd3d_free(v);
continue;
}
}
else
{
struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc);
assert(v->initializer.args_count == 1);
list_add_tail(v->initializer.instrs, &load->node.entry);
add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]);
}
if (modifiers & HLSL_STORAGE_STATIC) if (modifiers & HLSL_STORAGE_STATIC)
list_move_tail(&ctx->static_initializers, v->initializer.instrs); list_move_tail(&ctx->static_initializers, v->initializer.instrs);
else else
list_move_tail(statements_list, v->initializer.instrs); list_move_tail(statements_list, v->initializer.instrs);
vkd3d_free(v->initializer.args);
vkd3d_free(v->initializer.instrs); vkd3d_free(v->initializer.instrs);
} }
vkd3d_free(v); vkd3d_free(v);