[PATCH v2 9/9] vkd3d-shader/hlsl: Consider register() as manual packing for resource fields.

[Francisco Casas]

From: Francisco Casas

---
 libs/vkd3d-shader/hlsl_codegen.c | 5 +++--
 tests/cbuffer.shader_test        | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 35f9cceb..0c6c2375 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -2928,10 +2928,11 @@ static void validate_buffer_offsets(struct hlsl_ctx *ctx)
     LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
     {
         buffer = var1->buffer;
-        if (!buffer)
+        if (!buffer || buffer == ctx->globals_buffer)
             continue;

-        if (var1->offset_reservation.type == 'c')
+        if (var1->offset_reservation.type
+                || (var1->data_type->type == HLSL_CLASS_OBJECT && var1->reg_reservation.type))
             buffer->manually_packed_elements = true;
         else
             buffer->automatically_packed_elements = true;
diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test
index 6a4dda2d..da6a6cef 100644
--- a/tests/cbuffer.shader_test
+++ b/tests/cbuffer.shader_test
@@ -563,7 +563,7 @@ float4 main() : sv_target
 }

% register() can be used instead of packoffset().
-[pixel shader todo]
+[pixel shader]
 cbuffer buffer
 {
     float4 foo : packoffset(c0);
@@ -575,7 +575,7 @@ float4 main() : sv_target
     return 0;
 }

-[pixel shader todo]
+[pixel shader]
 cbuffer buffer
 {
     float4 foo : packoffset(c0);
@@ -588,7 +588,7 @@ float4 main() : sv_target
 }

% Using register() alone is considered manual packing for resources, so the other fields expect packoffset().
-[pixel shader fail todo]
+[pixel shader fail]
 cbuffer buffer
 {
     float4 foo;
@@ -600,7 +600,7 @@ float4 main() : sv_target
     return 0;
 }

-[pixel shader fail todo]
+[pixel shader fail]
 cbuffer buffer
 {
     float4 foo;