[PATCH 0/1] MR481: vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening.

[Giovanni Mascellani (＠giomasce)]

The previous computation was incorrect because the count was taken
after resetting it to zero (as part of setting the instruction to NOP).

[PATCH 1/1] vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening.

[Giovanni Mascellani]

From: Giovanni Mascellani

The previous computation was incorrect because the count was taken
after resetting it to zero (as part of setting the instruction to NOP).
---
 libs/vkd3d-shader/ir.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 2a3343994..6926de927 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -207,10 +207,15 @@ static void flattener_eliminate_phase_related_dcls(struct hull_flattener *normal
     {
         /* Leave only the first temp declaration and set it to the max count later. */
         if (!normaliser->max_temp_count)
+        {
+            normaliser->max_temp_count = ins->declaration.count;
             normaliser->temp_dcl_idx = index;
+        }
         else
+        {
+            normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count);
             vkd3d_shader_instruction_make_nop(ins);
-        normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count);
+        }
         return;
     }

[PATCH 0/1] MR481: vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/1] MR481: vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.