Matteo Bruni : vkd3d-shader: Allocate memory for a string buffer at init time.

[Alexandre Julliard]

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

Author: Matteo Bruni 
Date:   Thu Sep 30 21:36:17 2021 +0200

vkd3d-shader: Allocate memory for a string buffer at init time.

Signed-off-by: Matteo Bruni 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

libs/vkd3d-shader/vkd3d_shader_main.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index baf2561..ef9eaef 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -25,7 +25,11 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG");

void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer)
 {
-    memset(buffer, 0, sizeof(*buffer));
+    buffer->buffer_size = 16;
+    buffer->content_size = 0;
+    buffer->buffer = vkd3d_malloc(buffer->buffer_size);
+    assert(buffer->buffer);
+    memset(buffer->buffer, 0, buffer->buffer_size);
 }

void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer)
@@ -41,7 +45,7 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer)

static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc)
 {
-    unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32);
+    unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : buffer->buffer_size * 2;

if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1))
     {
@@ -58,9 +62,6 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *
     va_list a;
     int rc;

-    if (!buffer->content_size && !vkd3d_string_buffer_resize(buffer, 32))
-        return -1;
-
     for (;;)
     {
         rem = buffer->buffer_size - buffer->content_size;
@@ -144,11 +145,6 @@ struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_c
         if (!(buffer = vkd3d_malloc(sizeof(*buffer))))
             return NULL;
         vkd3d_string_buffer_init(buffer);
-        if (!vkd3d_string_buffer_resize(buffer, 1))
-        {
-            vkd3d_free(buffer);
-            return NULL;
-        }
     }
     else
     {