[PATCH vkd3d v2 6/6] vkd3d-shader/hlsl: Reroute initialization towards a generic variable initializer.
Francisco Casas
fcasas at codeweavers.com
Tue Feb 22 16:13:42 CST 2022
Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
---
v2:
- Use flatten_parse_initializer()'s return value.
- Remove guards for vkd3d_free(v->arrays.sizes).
I think the
if (v->initializer.args_count)
{
if (v->initializer.args_count > 1)
...
else
...
pattern should be kept, since there are instructions common for both cases at the
end of the block.
Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
---
libs/vkd3d-shader/hlsl.y | 101 ++++++++++++++++-----------------------
1 file changed, 41 insertions(+), 60 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 704e1eaf..759cebe7 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1489,14 +1489,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var
struct hlsl_struct_field *field;
unsigned int i = 0;
- if (initializer_size(initializer) != hlsl_type_component_count(type))
- {
- hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
- "Expected %u components in initializer, but got %u.",
- hlsl_type_component_count(type), initializer_size(initializer));
- return;
- }
-
LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry)
{
struct hlsl_ir_node *node = initializer->args[i];
@@ -1523,6 +1515,28 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var
}
}
+static void initialize_generic_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var,
+ struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type,
+ unsigned int *initializer_offset)
+{
+ if (type->type <= HLSL_CLASS_LAST_NUMERIC)
+ {
+ initialize_numeric_var(ctx, var, initializer, reg_offset, type, initializer_offset);
+ }
+ else if (type->type == HLSL_CLASS_STRUCT)
+ {
+ struct_var_initializer(ctx, var, initializer);
+ }
+ else if (type->type == HLSL_CLASS_ARRAY)
+ {
+ hlsl_fixme(ctx, &var->loc, "Initializers for arrays not supported yet.");
+ }
+ else if (type->type == HLSL_CLASS_OBJECT)
+ {
+ hlsl_fixme(ctx, &var->loc, "Initializers for objects not supported yet.");
+ }
+}
+
static void free_parse_variable_def(struct parse_variable_def *v)
{
free_parse_initializer(&v->initializer);
@@ -1644,67 +1658,34 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t
if (v->initializer.args_count)
{
- unsigned int size = initializer_size(&v->initializer);
-
- if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.args_count != 1
- && type->dimx * type->dimy != size)
- {
- hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
- "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)
- && hlsl_type_component_count(type) != size)
- {
- hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
- "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size);
- free_parse_initializer(&v->initializer);
- vkd3d_free(v);
- continue;
- }
-
- if (type->type == HLSL_CLASS_STRUCT)
- {
- struct_var_initializer(ctx, var, &v->initializer);
- list_move_tail(statements_list, v->initializer.instrs);
-
- free_parse_initializer(&v->initializer);
- vkd3d_free(v);
- continue;
- }
- if (type->type > HLSL_CLASS_LAST_NUMERIC)
- {
- FIXME("Initializers for non scalar/struct variables not supported yet.\n");
- free_parse_initializer(&v->initializer);
- vkd3d_free(v->arrays.sizes);
- vkd3d_free(v);
- continue;
- }
- if (v->arrays.count)
- {
- hlsl_fixme(ctx, &v->loc, "Array initializer.");
- free_parse_initializer(&v->initializer);
- vkd3d_free(v->arrays.sizes);
- vkd3d_free(v);
- continue;
- }
-
if (v->initializer.args_count > 1)
{
+ unsigned int size = initializer_size(&v->initializer);
unsigned int initializer_offset = 0;
- if (!flatten_parse_initializer(ctx, &v->initializer))
+ if (hlsl_type_component_count(type) != size)
{
- hlsl_fixme(ctx, &v->loc, "Could not flatten initializer.");
+ hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
+ "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size);
free_parse_initializer(&v->initializer);
+ vkd3d_free(v->arrays.sizes);
vkd3d_free(v);
continue;
}
- assert(v->initializer.args_count == size);
- initialize_numeric_var(ctx, var, &v->initializer, 0, type, &initializer_offset);
+
+ if (type->type <= HLSL_CLASS_LAST_NUMERIC)
+ {
+ if (!flatten_parse_initializer(ctx, &v->initializer))
+ {
+ hlsl_fixme(ctx, &v->loc, "Could not flatten initializer.");
+ free_parse_initializer(&v->initializer);
+ vkd3d_free(v->arrays.sizes);
+ vkd3d_free(v);
+ continue;
+ }
+ assert(v->initializer.args_count == size);
+ }
+ initialize_generic_var(ctx, var, &v->initializer, 0, type, &initializer_offset);
}
else
{
--
2.25.1
More information about the wine-devel
mailing list