Matteo Bruni : vkd3d-shader: Consider previous last_read value when computing liveness.

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Sun Mar 21 21:40:07 2021 +0100

vkd3d-shader: Consider previous last_read value when computing liveness.

Otherwise we end up overwriting UINT_MAX last_read for output variables.

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

---

 libs/vkd3d-shader/hlsl_codegen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 2382ffe..59514e4 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -342,7 +342,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs
             struct hlsl_ir_load *load = hlsl_ir_load(instr);
 
             var = load->src.var;
-            var->last_read = loop_last ? max(instr->index, loop_last) : instr->index;
+            var->last_read = max(var->last_read, loop_last ? max(instr->index, loop_last) : instr->index);
             if (load->src.offset.node)
                 load->src.offset.node->last_read = instr->index;
             break;