Zebediah Figura : vkd3d-shader: Allocate temporary registers for anonymous expressions.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: e957d3a3462b3e8a90bf656b24e09aab6a168af5
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=e957d3a3462b3e8a90bf656b...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Thu Apr  8 23:38:24 2021 -0500

vkd3d-shader: Allocate temporary registers for anonymous expressions.

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d-shader/hlsl.h         |  1 +
 libs/vkd3d-shader/hlsl_codegen.c | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index c5a611d..4122711 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -171,6 +171,7 @@ struct hlsl_ir_node
      * true even for loops, since currently we can't have a reference to a
      * value generated in an earlier iteration of the loop. */
     unsigned int index, last_read;
+    struct hlsl_reg reg;
 };
 
 struct hlsl_src
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index c8d3ed4..cfa021b 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -747,6 +747,18 @@ static void allocate_temp_registers_recurse(struct list *instrs, struct liveness
 
     LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry)
     {
+        if (!instr->reg.allocated && instr->last_read)
+        {
+            if (instr->data_type->reg_size > 1)
+                instr->reg = allocate_range(liveness, instr->index,
+                        instr->last_read, instr->data_type->reg_size);
+            else
+                instr->reg = allocate_register(liveness, instr->index,
+                        instr->last_read, instr->data_type->dimx);
+            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);
+        }
+
         switch (instr->type)
         {
             case HLSL_IR_IF: