Francisco Casas : vkd3d-shader/hlsl: Fix numeric offset of object fields.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 0ceecd1225248082a690ed13af9188a52e1809d8
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/0ceecd1225248082a690ed13af9188...

Author: Francisco Casas 
Date:   Tue Apr 11 12:01:02 2023 -0400

vkd3d-shader/hlsl: Fix numeric offset of object fields.

---

libs/vkd3d-shader/hlsl.c               | 3 ++-
 tests/object-field-offsets.shader_test | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 54f3292b..85b6ba8c 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -216,7 +216,8 @@ unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int
      *  (b) the type would cross a vec4 boundary; i.e. a vec3 and a
      *      vec1 can be packed together, but not a vec3 and a vec2.
      */
-    if (type->class > HLSL_CLASS_LAST_NUMERIC || (offset & 3) + type->reg_size[HLSL_REGSET_NUMERIC] > 4)
+    if (type->class == HLSL_CLASS_STRUCT || type->class == HLSL_CLASS_ARRAY
+            || (offset & 3) + type->reg_size[HLSL_REGSET_NUMERIC] > 4)
         return align(offset, 4);
     return offset;
 }
diff --git a/tests/object-field-offsets.shader_test b/tests/object-field-offsets.shader_test
index ec03cf2e..8afd9af7 100644
--- a/tests/object-field-offsets.shader_test
+++ b/tests/object-field-offsets.shader_test
@@ -20,7 +20,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 draw quad
-todo probe all rgba (1.0, 2.0, 3.0, 0.0)
+probe all rgba (1.0, 2.0, 3.0, 0.0)

[pixel shader]