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

[Alexandre Julliard]

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

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

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

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

---

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

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 368f59c..0ee4fe2 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -3019,23 +3019,15 @@ static void shader_write_descriptor_ranges1(struct vkd3d_bytecode_buffer *buffer
     }
 }

-static int shader_write_descriptor_table(struct root_signature_writer_context *context,
+static void shader_write_descriptor_table(struct root_signature_writer_context *context,
         const struct vkd3d_shader_root_descriptor_table *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;
+    put_u32(buffer, table->descriptor_range_count);
+    put_u32(buffer, get_chunk_offset(context) + sizeof(uint32_t)); /* offset */

shader_write_descriptor_ranges(buffer, table);
-    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 root descriptor table.");
-    return VKD3D_ERROR_OUT_OF_MEMORY;
 }

static int shader_write_descriptor_table1(struct root_signature_writer_context *context,
@@ -3131,13 +3123,15 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co

for (i = 0; i < parameter_count; ++i)
     {
+        ret = VKD3D_OK;
+
         set_u32(buffer, parameters_position + ((3 * i + 2) * sizeof(uint32_t)), get_chunk_offset(context));

switch (versioned_root_signature_get_parameter_type(desc, i))
         {
             case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE:
                 if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0)
-                    ret = shader_write_descriptor_table(context, &desc->u.v_1_0.parameters[i].u.descriptor_table);
+                    shader_write_descriptor_table(context, &desc->u.v_1_0.parameters[i].u.descriptor_table);
                 else
                     ret = shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table);
                 break;