Zebediah Figura : tests: Add a helper to set uniforms.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: ecbdd8f994cfb1b4cc125e64ae328b24942de520
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=ecbdd8f994cfb1b4cc125e64...

Author: Zebediah Figura 
Date:   Wed Jan 26 19:40:32 2022 -0600

tests: Add a helper to set uniforms.

Signed-off-by: Zebediah Figura 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

tests/shader_runner.c | 36 ++++++++++++------------------------
 tests/shader_runner.h |  2 +-
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/tests/shader_runner.c b/tests/shader_runner.c
index 12fdad3..ae5daa7 100644
--- a/tests/shader_runner.c
+++ b/tests/shader_runner.c
@@ -276,6 +276,14 @@ static void parse_texture_directive(struct texture_params *texture, const char *
     }
 }

+static void set_uniforms(struct shader_context *context, size_t offset, size_t count, const void *uniforms)
+{
+    context->uniform_count = max(context->uniform_count, offset + count);
+    vkd3d_array_reserve((void **)&context->uniforms, &context->uniform_capacity,
+            context->uniform_count, sizeof(*context->uniforms));
+    memcpy(context->uniforms + offset, uniforms, count * sizeof(*context->uniforms));
+}
+
 static void parse_test_directive(struct shader_context *context, const char *line)
 {
     if (match_string(line, "draw quad", &line))
@@ -350,12 +358,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin

if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4)
                 fatal_error("Malformed float4 constant '%s'.\n", line);
-            if (offset + 4 > context->uniform_count)
-            {
-                context->uniform_count = offset + 4;
-                context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms));
-            }
-            memcpy(context->uniforms + offset, &v, sizeof(v));
+            set_uniforms(context, offset, 4, &v);
         }
         else if (match_string(line, "float", &line))
         {
@@ -363,12 +366,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin

if (sscanf(line, "%f", &f) < 1)
                 fatal_error("Malformed float constant '%s'.\n", line);
-            if (offset + 1 > context->uniform_count)
-            {
-                context->uniform_count = offset + 1;
-                context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms));
-            }
-            memcpy(context->uniforms + offset, &f, sizeof(f));
+            set_uniforms(context, offset, 1, &f);
         }
         else if (match_string(line, "int", &line))
         {
@@ -376,12 +374,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin

if (sscanf(line, "%i", &i) < 1)
                 fatal_error("Malformed int constant '%s'.\n", line);
-            if (offset + 1 > context->uniform_count)
-            {
-                context->uniform_count = offset + 1;
-                context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms));
-            }
-            memcpy(context->uniforms + offset, &i, sizeof(i));
+            set_uniforms(context, offset, 1, &i);
         }
         else if (match_string(line, "uint", &line))
         {
@@ -389,12 +382,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin

if (sscanf(line, "%u", &u) < 1)
                 fatal_error("Malformed uint constant '%s'.\n", line);
-            if (offset + 1 > context->uniform_count)
-            {
-                context->uniform_count = offset + 1;
-                context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms));
-            }
-            memcpy(context->uniforms + offset, &u, sizeof(u));
+            set_uniforms(context, offset, 1, &u);
         }
     }
     else
diff --git a/tests/shader_runner.h b/tests/shader_runner.h
index 6865d4d..9a687ed 100644
--- a/tests/shader_runner.h
+++ b/tests/shader_runner.h
@@ -70,7 +70,7 @@ struct shader_context
     enum shader_model minimum_shader_model;

uint32_t *uniforms;
-    size_t uniform_count;
+    size_t uniform_count, uniform_capacity;

struct texture **textures;
     size_t texture_count;