[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [v2 PATCH vkd3d 2/2] vkd3d-shader: Allocate memory for a string buffer at init time.
From:       Matteo Bruni <mbruni () codeweavers ! com>
Date:       2021-09-30 19:36:17
Message-ID: 20210930193617.615599-2-mbruni () codeweavers ! com
[Download RAW message or body]

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
---
v2: Get rid of now unnecessary max() in vkd3d_string_buffer_resize()
for the rc < 0 case.

 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 baf25612..ef9eaef5 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
     {
-- 
2.26.3


[prev in list] [next in list] [prev in thread] [next in thread]