Zebediah Figura : vkd3d-shader/hlsl: Allocate register reservations for structs as well.

[Alexandre Julliard]

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

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Sat Jan 13 18:47:31 2024 -0600

vkd3d-shader/hlsl: Allocate register reservations for structs as well.

---

 libs/vkd3d-shader/hlsl_codegen.c                       | 3 ---
 tests/hlsl/register-reservations-resources.shader_test | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index ff349ab4..d03be6b1 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -3761,9 +3761,6 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx)
     {
         unsigned int r;
 
-        if (!hlsl_type_is_resource(var->data_type))
-            continue;
-
         if (var->reg_reservation.reg_type)
         {
             for (r = 0; r <= HLSL_REGSET_LAST_OBJECT; ++r)
diff --git a/tests/hlsl/register-reservations-resources.shader_test b/tests/hlsl/register-reservations-resources.shader_test
index d6b577bd..a618c979 100644
--- a/tests/hlsl/register-reservations-resources.shader_test
+++ b/tests/hlsl/register-reservations-resources.shader_test
@@ -198,7 +198,7 @@ filter linear linear linear
 address clamp clamp clamp
 
 % If a struct spans many object register sets and one is reserved, all other used object register sets must be.
-[pixel shader fail(sm<6) todo]
+[pixel shader fail(sm<6)]
 struct
 {
      Texture2D tex;
@@ -242,4 +242,4 @@ float4 main() : sv_target
 
 [test]
 todo(glsl) draw quad
-todo(sm<6) probe all rgba (1.0, 1.0, 1.0, 99.0)
+probe all rgba (1.0, 1.0, 1.0, 99.0)