Nikolay Sivov : vkd3d-shader/fx: Populate global variables list during context initialization.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: ed06e0bbef2814edf11221fe58d58a978a0d4080
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/ed06e0bbef2814edf11221fe58d58a...

Author: Nikolay Sivov 
Date:   Wed Mar 13 23:39:27 2024 +0100

vkd3d-shader/fx: Populate global variables list during context initialization.

Signed-off-by: Nikolay Sivov

---

libs/vkd3d-shader/fx.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c
index f68d38fa..aaa9f015 100644
--- a/libs/vkd3d-shader/fx.c
+++ b/libs/vkd3d-shader/fx.c
@@ -159,6 +159,7 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co
         struct fx_write_context *fx)
 {
     unsigned int version = ctx->profile->major_version;
+    struct hlsl_block block;

memset(fx, 0, sizeof(*fx));

@@ -184,6 +185,11 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co
     list_init(&fx->types);

fx->child_effect = fx->ops->are_child_effects_supported && ctx->child_effect;
+
+    hlsl_block_init(&block);
+    hlsl_prepend_global_uniform_copy(fx->ctx, &block);
+    hlsl_block_cleanup(&block);
+    hlsl_calculate_buffer_offsets(fx->ctx);
 }

static int fx_write_context_cleanup(struct fx_write_context *fx)
@@ -836,12 +842,6 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx
 static void write_buffers(struct fx_write_context *fx)
 {
     struct hlsl_buffer *buffer;
-    struct hlsl_block block;
-
-    hlsl_block_init(&block);
-    hlsl_prepend_global_uniform_copy(fx->ctx, &block);
-    hlsl_block_cleanup(&block);
-    hlsl_calculate_buffer_offsets(fx->ctx);

LIST_FOR_EACH_ENTRY(buffer, &fx->ctx->buffers, struct hlsl_buffer, entry)
     {