wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Factor the component count check into initialize_var().

Browse Source
This commit is contained in:
Elizabeth Figura 2024-08-29 12:48:23 -05:00 committed by Henri Verbeet
parent d8892a4ca2
commit dfe79cb6a9
Notes: Henri Verbeet 2024-10-17 17:39:41 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1185
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2512,6 +2512,14 @@ static void initialize_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *dst,
{ {
unsigned int store_index = 0; unsigned int store_index = 0;
if (initializer_size(initializer) != hlsl_type_component_count(dst->data_type))
{
hlsl_error(ctx, &initializer->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
"Expected %u components in initializer, but got %u.",
hlsl_type_component_count(dst->data_type), initializer_size(initializer));
return;
}
for (unsigned int i = 0; i < initializer->args_count; ++i) for (unsigned int i = 0; i < initializer->args_count; ++i)
initialize_var_components(ctx, initializer->instrs, dst, &store_index, initialize_var_components(ctx, initializer->instrs, dst, &store_index,
initializer->args[i], is_default_values_initializer); initializer->args[i], is_default_values_initializer);
@ -2843,7 +2851,6 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var
if (v->initializer.args_count) if (v->initializer.args_count)
{ {
bool is_default_values_initializer; bool is_default_values_initializer;
unsigned int size;
is_default_values_initializer = (ctx->cur_buffer != ctx->globals_buffer) is_default_values_initializer = (ctx->cur_buffer != ctx->globals_buffer)
|| (var->storage_modifiers & HLSL_STORAGE_UNIFORM) || (var->storage_modifiers & HLSL_STORAGE_UNIFORM)
@ -2881,15 +2888,6 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var
v->initializer.args[0] = node_from_block(v->initializer.instrs); v->initializer.args[0] = node_from_block(v->initializer.instrs);
} }
size = initializer_size(&v->initializer);
if (component_count != size)
{
hlsl_error(ctx, &v->initializer.loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
"Expected %u components in initializer, but got %u.", component_count, size);
free_parse_variable_def(v);
continue;
}
initialize_var(ctx, var, &v->initializer, is_default_values_initializer); initialize_var(ctx, var, &v->initializer, is_default_values_initializer);
if (is_default_values_initializer) if (is_default_values_initializer)
@ -8958,14 +8956,6 @@ postfix_expr:
free_parse_initializer(&$4); free_parse_initializer(&$4);
YYABORT; YYABORT;
} }
if ($2->dimx * $2->dimy != initializer_size(&$4))
{
hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
"Expected %u components in constructor, but got %u.",
$2->dimx * $2->dimy, initializer_size(&$4));
free_parse_initializer(&$4);
YYABORT;
}
if (!($$ = add_constructor(ctx, $2, &$4, &@2))) if (!($$ = add_constructor(ctx, $2, &$4, &@2)))
{ {