[PATCH vkd3d 1/6] vkd3d-shader: Zero-initialize constant definitions.

Zebediah Figura zfigura at codeweavers.com
Mon Jun 21 23:37:06 CDT 2021


From: Matteo Bruni <mbruni at codeweavers.com>

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
Resent without changes, as this clashes with a later patch in this series.

 libs/vkd3d-shader/hlsl_codegen.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 366b8bda..54c91bf8 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -843,7 +843,12 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list *
                 if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size,
                         constant->reg.id + reg_size, sizeof(*defs->values)))
                     return;
-                defs->count = max(defs->count, constant->reg.id + reg_size);
+                if (constant->reg.id + reg_size > defs->count)
+                {
+                    memset(&defs->values[defs->count], 0,
+                            sizeof(*defs->values) * (constant->reg.id + reg_size - defs->count));
+                    defs->count = constant->reg.id + reg_size;
+                }
 
                 assert(type->type <= HLSL_CLASS_LAST_NUMERIC);
 
-- 
2.32.0




More information about the wine-devel mailing list