[PATCH vkd3d v3 7/8] vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
Francisco Casas
fcasas at codeweavers.com
Wed Mar 2 12:31:47 CST 2022
Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
---
v3:
- New in v3. Split of
vkd3d-shader/hlsl: Reroute initialization towards a generic
variable initializer.
Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
---
libs/vkd3d-shader/hlsl.y | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 547a2ff4..c98e73f7 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1522,23 +1522,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t
continue;
}
- if (type->type == HLSL_CLASS_STRUCT)
- {
- struct_var_initializer(ctx, statements_list, var, &v->initializer);
- vkd3d_free(v);
- continue;
- }
- if (type->type > HLSL_CLASS_LAST_NUMERIC)
+ if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT)
{
FIXME("Initializers for non scalar/struct variables not supported yet.\n");
free_parse_initializer(&v->initializer);
vkd3d_free(v);
continue;
}
- if (v->arrays.count)
+
+ if (type->type == HLSL_CLASS_STRUCT)
{
- hlsl_fixme(ctx, &v->loc, "Array initializer.");
- free_parse_initializer(&v->initializer);
+ struct_var_initializer(ctx, statements_list, var, &v->initializer);
vkd3d_free(v);
continue;
}
--
2.25.1
More information about the wine-devel
mailing list