Francisco Casas : vkd3d-shader/hlsl: Use reg_size as component count when allocating a single register.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: f21693b28458f6198d93226fd808eda3cae04c48
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/f21693b28458f6198d93226fd808ed...

Author: Francisco Casas 
Date:   Mon Oct 31 12:35:16 2022 -0300

vkd3d-shader/hlsl: Use reg_size as component count when allocating a single register.

Otherwise, for instance, the added test results in:

debug_hlsl_writemask: Assertion `!(writemask & ~VKD3DSP_WRITEMASK_ALL)' failed.

Which happens in allocate_variable_temp_register() when the variable's
type reg_size is <= 4 but its component count is larger, which may
happen if it contains objects.

---

libs/vkd3d-shader/hlsl_codegen.c    |  8 ++++----
 tests/object-references.shader_test | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 18c26771..58d44c4d 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1927,7 +1927,7 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir
                     var->last_read, var->data_type->reg_size);
         else
             var->reg = allocate_register(ctx, liveness, var->first_write,
-                    var->last_read, hlsl_type_component_count(var->data_type));
+                    var->last_read, var->data_type->reg_size);
         TRACE("Allocated %s to %s (liveness %u-%u).\n", var->name,
                 debug_register('r', var->reg, var->data_type), var->first_write, var->last_read);
     }
@@ -1946,7 +1946,7 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_bl
                         instr->last_read, instr->data_type->reg_size);
             else
                 instr->reg = allocate_register(ctx, liveness, instr->index,
-                        instr->last_read, instr->data_type->dimx);
+                        instr->last_read, instr->data_type->reg_size);
             TRACE("Allocated anonymous expression @%u to %s (liveness %u-%u).\n", instr->index,
                     debug_register('r', instr->reg, instr->data_type), instr->index, instr->last_read);
         }
@@ -2009,7 +2009,7 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_b
                 if (reg_size > 4)
                     constant->reg = allocate_range(ctx, liveness, 1, UINT_MAX, reg_size);
                 else
-                    constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, type->dimx);
+                    constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, reg_size);
                 TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type));

if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size,
@@ -2111,7 +2111,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi
             else
             {
                 var->reg = allocate_register(ctx, &liveness, 1, UINT_MAX, 4);
-                var->reg.writemask = (1u << var->data_type->dimx) - 1;
+                var->reg.writemask = (1u << var->data_type->reg_size) - 1;
             }
             TRACE("Allocated %s to %s.\n", var->name, debug_register('c', var->reg, var->data_type));
         }
diff --git a/tests/object-references.shader_test b/tests/object-references.shader_test
index f3fda472..a33bd14a 100644
--- a/tests/object-references.shader_test
+++ b/tests/object-references.shader_test
@@ -118,3 +118,28 @@ float4 main() : sv_target
 {
     return tex[n].Load(0);
 }
+
+
+[pixel shader todo]
+Texture2D tex;
+uniform float f;
+
+struct apple
+{
+    Texture2D tex1;
+    Texture2D tex2;
+    float3 aa;
+};
+
+float4 main() : sv_target
+{
+    struct apple a = {tex, tex, 1.0, 2.0, 3.0};
+
+    a.aa += f;
+    return a.aa.xyzx;
+}
+
+[test]
+uniform 0 float 10.0
+todo draw quad
+todo probe (0, 0) rgba (11.0, 12.0, 13.0, 11.0)