Nikolay Sivov : vkd3d-shader/fx: Do not align strings for fx_4/fx_5 profiles.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 656c068b324151aba9d85b363e23a40a1bee6929
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/656c068b324151aba9d85b363e23a4...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Tue Feb  6 14:21:46 2024 +0100

vkd3d-shader/fx: Do not align strings for fx_4/fx_5 profiles.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

---

 libs/vkd3d-shader/fx.c                   |  2 +-
 libs/vkd3d-shader/vkd3d_shader_main.c    | 10 ++++++++--
 libs/vkd3d-shader/vkd3d_shader_private.h |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c
index b56dfa21..ac7ffae8 100644
--- a/libs/vkd3d-shader/fx.c
+++ b/libs/vkd3d-shader/fx.c
@@ -145,7 +145,7 @@ static uint32_t write_fx_4_string(const char *string, struct fx_write_context *f
     if (!(string_entry = hlsl_alloc(fx->ctx, sizeof(*string_entry))))
         return 0;
 
-    string_entry->offset = put_string(&fx->unstructured, string);
+    string_entry->offset = bytecode_put_bytes_unaligned(&fx->unstructured, string, strlen(string) + 1);
     string_entry->string = string;
 
     rb_put(&fx->strings, string, &string_entry->entry);
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index ebabf50e..20c4c2e2 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -366,9 +366,9 @@ size_t bytecode_align(struct vkd3d_bytecode_buffer *buffer)
     return aligned_size;
 }
 
-size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size)
+size_t bytecode_put_bytes_unaligned(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size)
 {
-    size_t offset = bytecode_align(buffer);
+    size_t offset = buffer->size;
 
     if (buffer->status)
         return offset;
@@ -383,6 +383,12 @@ size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *byte
     return offset;
 }
 
+size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size)
+{
+    bytecode_align(buffer);
+    return bytecode_put_bytes_unaligned(buffer, bytes, size);
+}
+
 size_t bytecode_reserve_bytes(struct vkd3d_bytecode_buffer *buffer, size_t size)
 {
     size_t offset = bytecode_align(buffer);
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 1030adf9..7239beaf 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -1418,6 +1418,7 @@ struct vkd3d_bytecode_buffer
 /* Align to the next 4-byte offset, and return that offset. */
 size_t bytecode_align(struct vkd3d_bytecode_buffer *buffer);
 size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size);
+size_t bytecode_put_bytes_unaligned(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size);
 size_t bytecode_reserve_bytes(struct vkd3d_bytecode_buffer *buffer, size_t size);
 void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value);
 void set_string(struct vkd3d_bytecode_buffer *buffer, size_t offset, const char *string, size_t length);