[PATCH v2 5/5] vkd3d-shader/fx: Do not align structured data section.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/fx.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c
index 2930e6dc2..ddc10ad60 100644
--- a/libs/vkd3d-shader/fx.c
+++ b/libs/vkd3d-shader/fx.c
@@ -675,8 +675,8 @@ static void write_buffers(struct fx_write_context *fx)
 static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
 {
     struct vkd3d_bytecode_buffer buffer = { 0 };
-    uint32_t size_offset, size;
     struct fx_write_context fx;
+    uint32_t size_offset;

fx_write_context_init(ctx, &fx_4_ops, &fx);

@@ -709,11 +709,10 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
     put_u32(&buffer, 0); /* Shader count. */
     put_u32(&buffer, 0); /* Inline shader count. */

-    size = align(fx.unstructured.size, 4);
-    set_u32(&buffer, size_offset, size);
+    set_u32(&buffer, size_offset, fx.unstructured.size);

bytecode_put_bytes(&buffer, fx.unstructured.data, fx.unstructured.size);
-    bytecode_put_bytes(&buffer, fx.structured.data, fx.structured.size);
+    bytecode_put_bytes_unaligned(&buffer, fx.structured.data, fx.structured.size);

vkd3d_free(fx.unstructured.data);
     vkd3d_free(fx.structured.data);
@@ -735,8 +734,8 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
 static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
 {
     struct vkd3d_bytecode_buffer buffer = { 0 };
-    uint32_t size_offset, size;
     struct fx_write_context fx;
+    uint32_t size_offset;

fx_write_context_init(ctx, &fx_4_ops, &fx);

@@ -773,11 +772,10 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
     put_u32(&buffer, 0); /* Interface variable element count. */
     put_u32(&buffer, 0); /* Class instance elements count. */

-    size = align(fx.unstructured.size, 4);
-    set_u32(&buffer, size_offset, size);
+    set_u32(&buffer, size_offset, fx.unstructured.size);

bytecode_put_bytes(&buffer, fx.unstructured.data, fx.unstructured.size);
-    bytecode_put_bytes(&buffer, fx.structured.data, fx.structured.size);
+    bytecode_put_bytes_unaligned(&buffer, fx.structured.data, fx.structured.size);

vkd3d_free(fx.unstructured.data);
     vkd3d_free(fx.structured.data);