Francisco Casas : vkd3d-shader/hlsl: Don't allow manual and automatic cbuffer offset packing.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 60237cb77324126dbce3ef0744880fa9fad8db8d
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/60237cb77324126dbce3ef0744880f...

Author: Francisco Casas 
Date:   Tue Feb 21 22:39:24 2023 -0300

vkd3d-shader/hlsl: Don't allow manual and automatic cbuffer offset packing.

---

libs/vkd3d-shader/hlsl.h         |  3 +++
 libs/vkd3d-shader/hlsl_codegen.c | 19 +++++++++++++++++++
 tests/cbuffer.shader_test        |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index a19a65c5..38a7715e 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -678,6 +678,9 @@ struct hlsl_buffer
     unsigned size, used_size;
     /* Register of type 'b' on which the buffer is allocated. */
     struct hlsl_reg reg;
+
+    bool manually_packed_elements;
+    bool automatically_packed_elements;
 };

struct hlsl_ctx
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 2e10aa55..610b576c 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -2990,6 +2990,25 @@ static void validate_buffer_offsets(struct hlsl_ctx *ctx)
                         var1->name, var2->name);
         }
     }
+
+    LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
+    {
+        buffer = var1->buffer;
+        if (!buffer)
+            continue;
+
+        if (var1->reg_reservation.offset_type == 'c')
+            buffer->manually_packed_elements = true;
+        else
+            buffer->automatically_packed_elements = true;
+
+        if (buffer->manually_packed_elements && buffer->automatically_packed_elements)
+        {
+            hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
+                    "packoffset() must be specified for all the buffer elements, or none of them.");
+            break;
+        }
+    }
 }

static void allocate_buffers(struct hlsl_ctx *ctx)
diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test
index d8cfc351..8c6e1724 100644
--- a/tests/cbuffer.shader_test
+++ b/tests/cbuffer.shader_test
@@ -305,7 +305,7 @@ draw quad
 probe all rgba (512.0, 612.0, 712.0, 812.0)

-[pixel shader fail todo]
+[pixel shader fail]
 // packoffset cannot be used unless all elements use it.
 cbuffer buffer
 {