[PATCH v2 3/4] vkd3d-shader/hlsl: Make register(cX) reservations work for SM1.

[Francisco Casas]

From: Francisco Casas

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

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 76a010fb3..56ef0aa5b 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -3954,8 +3954,32 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi
             if (reg_size == 0)
                 continue;

-            var->regs[HLSL_REGSET_NUMERIC] = allocate_numeric_registers_for_type(ctx, &allocator,
-                    1, UINT_MAX, var->data_type);
+            if (var->reg_reservation.reg_type == 'c')
+            {
+                unsigned int reg_idx = var->reg_reservation.reg_index;
+                unsigned int i;
+
+                assert(reg_size % 4 == 0);
+                for (i = 0; i < reg_size / 4; ++i)
+                {
+                    if (get_available_writemask(&allocator, 1, UINT_MAX, reg_idx + i) != VKD3DSP_WRITEMASK_ALL)
+                    {
+                        hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
+                                "Overlapping register() reservations on 'c%u'.", reg_idx + i);
+                    }
+
+                    record_allocation(ctx, &allocator, reg_idx + i, VKD3DSP_WRITEMASK_ALL, 1, UINT_MAX);
+                }
+
+                var->regs[HLSL_REGSET_NUMERIC].id = reg_idx;
+                var->regs[HLSL_REGSET_NUMERIC].allocation_size = reg_size / 4;
+                var->regs[HLSL_REGSET_NUMERIC].allocated = true;
+            }
+            else
+            {
+                var->regs[HLSL_REGSET_NUMERIC] = allocate_numeric_registers_for_type(ctx, &allocator,
+                        1, UINT_MAX, var->data_type);
+            }
             TRACE("Allocated %s to %s.\n", var->name,
                     debug_register('c', var->regs[HLSL_REGSET_NUMERIC], var->data_type));
         }
diff --git a/tests/hlsl/register-reservations.shader_test b/tests/hlsl/register-reservations.shader_test
index 056c6d1b5..7ac6f1414 100644
--- a/tests/hlsl/register-reservations.shader_test
+++ b/tests/hlsl/register-reservations.shader_test
@@ -30,7 +30,7 @@ uniform 4 float4 1.1 1.2 1.3 1.4
 uniform 8 float4 2.1 2.2 2.3 2.4
 uniform 12 float4 3.1 3.2 3.3 3.4
 draw quad
-todo probe all rgba (2.1, 2.2, 3.1, 0.0)
+probe all rgba (2.1, 2.2, 3.1, 0.0)

[require]