[PATCH 0/1] MR253: vkd3d-shader/hlsl: Skip unallocated variables when looking for reservation conflicts.

[Zebediah Figura (＠zfigura)]

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/253

[PATCH 1/1] vkd3d-shader/hlsl: Skip unallocated variables when looking for reservation conflicts.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

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

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index b980ed56..d3af09ef 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -3680,7 +3680,7 @@ static void allocate_buffers(struct hlsl_ctx *ctx)
 }
 
 static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum hlsl_regset regset,
-        uint32_t index)
+        uint32_t index, bool allocated_only)
 {
     const struct hlsl_ir_var *var;
     unsigned int start, count;
@@ -3694,6 +3694,9 @@ static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum
              * bound there even if the reserved vars aren't used. */
             start = var->reg_reservation.reg_index;
             count = var->data_type->reg_size[regset];
+
+            if (!var->regs[regset].allocated && allocated_only)
+                continue;
         }
         else if (var->regs[regset].allocated)
         {
@@ -3734,6 +3737,7 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset)
         if (count == 0)
             continue;
 
+        /* The variable was already allocated if it has a reservation. */
         if (var->regs[regset].allocated)
         {
             const struct hlsl_ir_var *reserved_object, *last_reported = NULL;
@@ -3752,7 +3756,10 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset)
             {
                 index = var->regs[regset].id + i;
 
-                reserved_object = get_allocated_object(ctx, regset, index);
+                /* get_allocated_object() may return "var" itself, but we
+                 * actually want that, otherwise we'll end up reporting the
+                 * same conflict between the same two variables twice. */
+                reserved_object = get_allocated_object(ctx, regset, index, true);
                 if (reserved_object && reserved_object != var && reserved_object != last_reported)
                 {
                     hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS,
@@ -3771,7 +3778,7 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset)
 
             while (available < count)
             {
-                if (get_allocated_object(ctx, regset, index))
+                if (get_allocated_object(ctx, regset, index, false))
                     available = 0;
                 else
                     ++available;
diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test
index d885b209..7e109eca 100644
--- a/tests/register-reservations.shader_test
+++ b/tests/register-reservations.shader_test
@@ -144,7 +144,7 @@ draw quad
 probe all rgba (2.0, 2.0, 2.0, 99.0)
 
 
-[pixel shader todo]
+[pixel shader]
 Texture2D tex1 : register(t2);
 Texture2D tex2 : register(t2);
 
@@ -154,5 +154,5 @@ float4 main() : sv_target
 }
 
 [test]
-todo draw quad
+draw quad
 probe all rgba (2.0, 2.0, 2.0, 99.0)
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/253

[PATCH 0/1] MR253: vkd3d-shader/hlsl: Skip unallocated variables when looking for reservation conflicts. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/253

[PATCH 0/1] MR253: vkd3d-shader/hlsl: Skip unallocated variables when looking for reservation conflicts. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/253

[Henri Verbeet (＠hverbeet)]

For what it's worth, I think the main thing blocking this is that it doesn't apply cleanly.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/253#note_38515