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 out an initialize_var() helper.

Browse Source
This commit is contained in:
Elizabeth Figura 2024-08-29 12:48:23 -05:00 committed by Henri Verbeet
parent e411fcb60e
commit 44ea7b5e12
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 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2506,6 +2506,16 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *i
} }
} }
static void initialize_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *dst,
const struct parse_initializer *initializer, bool is_default_values_initializer)
{
unsigned int store_index = 0;
for (unsigned int i = 0; i < initializer->args_count; ++i)
initialize_var_components(ctx, initializer->instrs, dst, &store_index,
initializer->args[i], is_default_values_initializer);
}
static bool type_has_object_components(const struct hlsl_type *type) static bool type_has_object_components(const struct hlsl_type *type)
{ {
if (type->class == HLSL_CLASS_ARRAY) if (type->class == HLSL_CLASS_ARRAY)
@ -2832,8 +2842,7 @@ 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 store_index = 0; unsigned int size;
unsigned int size, k;
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)
@ -2880,11 +2889,7 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var
continue; continue;
} }
for (k = 0; k < v->initializer.args_count; ++k) initialize_var(ctx, var, &v->initializer, is_default_values_initializer);
{
initialize_var_components(ctx, v->initializer.instrs, var,
&store_index, v->initializer.args[k], is_default_values_initializer);
}
if (is_default_values_initializer) if (is_default_values_initializer)
{ {
@ -5402,13 +5407,11 @@ static struct hlsl_block *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type
{ {
struct hlsl_ir_load *load; struct hlsl_ir_load *load;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
unsigned int i, idx = 0;
if (!(var = hlsl_new_synthetic_var(ctx, "constructor", type, loc))) if (!(var = hlsl_new_synthetic_var(ctx, "constructor", type, loc)))
return NULL; return NULL;
for (i = 0; i < params->args_count; ++i) initialize_var(ctx, var, params, false);
initialize_var_components(ctx, params->instrs, var, &idx, params->args[i], false);
if (!(load = hlsl_new_var_load(ctx, var, loc))) if (!(load = hlsl_new_var_load(ctx, var, loc)))
return NULL; return NULL;