Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges1().

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Tue Jul 27 16:06:47 2021 -0500

vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges1().

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

---

libs/vkd3d-shader/dxbc.c | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 2151869..368f59c 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -3002,7 +3002,7 @@ static void shader_write_descriptor_ranges(struct vkd3d_bytecode_buffer *buffer,
     }
 }

-static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context,
+static void shader_write_descriptor_ranges1(struct vkd3d_bytecode_buffer *buffer,
         const struct vkd3d_shader_root_descriptor_table1 *table)
 {
     const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges;
@@ -3010,26 +3010,13 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context

for (i = 0; i < table->descriptor_range_count; ++i)
     {
-        if (!write_dword(context, ranges[i].range_type))
-            goto fail;
-        if (!write_dword(context, ranges[i].descriptor_count))
-            goto fail;
-        if (!write_dword(context, ranges[i].base_shader_register))
-            goto fail;
-        if (!write_dword(context, ranges[i].register_space))
-            goto fail;
-        if (!write_dword(context, ranges[i].flags))
-            goto fail;
-        if (!write_dword(context, ranges[i].descriptor_table_offset))
-            goto fail;
+        put_u32(buffer, ranges[i].range_type);
+        put_u32(buffer, ranges[i].descriptor_count);
+        put_u32(buffer, ranges[i].base_shader_register);
+        put_u32(buffer, ranges[i].register_space);
+        put_u32(buffer, ranges[i].flags);
+        put_u32(buffer, ranges[i].descriptor_table_offset);
     }
-
-    return VKD3D_OK;
-
-fail:
-    vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,
-            "Out of memory while writing root signature descriptor ranges.");
-    return VKD3D_ERROR_OUT_OF_MEMORY;
 }

static int shader_write_descriptor_table(struct root_signature_writer_context *context,
@@ -3054,12 +3041,15 @@ fail:
 static int shader_write_descriptor_table1(struct root_signature_writer_context *context,
         const struct vkd3d_shader_root_descriptor_table1 *table)
 {
+    struct vkd3d_bytecode_buffer *buffer = &context->buffer;
+
     if (!write_dword(context, table->descriptor_range_count))
         goto fail;
     if (!write_dword(context, get_chunk_offset(context) + sizeof(DWORD))) /* offset */
         goto fail;

-    return shader_write_descriptor_ranges1(context, table);
+    shader_write_descriptor_ranges1(buffer, table);
+    return VKD3D_OK;

fail:
     vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,