Henri Verbeet : vkd3d-shader/dxbc: Store DXBC section data as a vkd3d_shader_code structure.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: b59de4de5ce89de46fc9b5961771981ba65cf310
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/b59de4de5ce89de46fc9b596177198...

Author: Henri Verbeet 
Date:   Mon Feb 20 13:47:03 2023 +0100

vkd3d-shader/dxbc: Store DXBC section data as a vkd3d_shader_code structure.

---

libs/vkd3d-shader/dxbc.c                 | 8 ++++----
 libs/vkd3d-shader/hlsl_sm4.c             | 2 +-
 libs/vkd3d-shader/vkd3d_shader_private.h | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 4041e0f5..a0be8d74 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -39,8 +39,8 @@ void dxbc_writer_add_section(struct dxbc_writer *dxbc, uint32_t tag, const void

section = &dxbc->sections[dxbc->section_count++];
     section->tag = tag;
-    section->data = data;
-    section->size = size;
+    section->data.code = data;
+    section->data.size = size;
 }

int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *out)
@@ -67,8 +67,8 @@ int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *out)
     {
         set_u32(&buffer, offsets_position + i * sizeof(uint32_t), bytecode_get_size(&buffer));
         put_u32(&buffer, dxbc->sections[i].tag);
-        put_u32(&buffer, dxbc->sections[i].size);
-        bytecode_put_bytes(&buffer, dxbc->sections[i].data, dxbc->sections[i].size);
+        put_u32(&buffer, dxbc->sections[i].data.size);
+        bytecode_put_bytes(&buffer, dxbc->sections[i].data.code, dxbc->sections[i].data.size);
     }
     set_u32(&buffer, size_position, bytecode_get_size(&buffer));

diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index b95aab4e..3e1769ac 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -2519,6 +2519,6 @@ int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun
     if (!(ret = ctx->result))
         ret = dxbc_writer_write(&dxbc, out);
     for (i = 0; i < dxbc.section_count; ++i)
-        vkd3d_free((void *)dxbc.sections[i].data);
+        vkd3d_shader_free_shader_code(&dxbc.sections[i].data);
     return ret;
 }
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 6c5a1917..56100e46 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -1311,8 +1311,7 @@ static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain,
 struct dxbc_writer_section
 {
     uint32_t tag;
-    const uint8_t *data;
-    size_t size;
+    struct vkd3d_shader_code data;
 };

#define DXBC_MAX_SECTION_COUNT 5