Giovanni Mascellani : vkd3d-shader/ir: Properly handle function-local indexable temps when flattening control flow.

[Alexandre Julliard]

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

Author: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Date:   Tue Feb 20 15:44:23 2024 +0100

vkd3d-shader/ir: Properly handle function-local indexable temps when flattening control flow.

They have to be considered code rather than declarations, as required
for instance by the SPIR-V backend.

---

 libs/vkd3d-shader/ir.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index f0bd8533..a379ba6d 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -2041,12 +2041,19 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte
         flattener->location = instruction->location;
 
         /* Declarations should occur before the first code block, which in hull shaders is marked by the first
-         * phase instruction, and in all other shader types begins with the first label instruction. */
-        if (!after_declarations_section && !vsir_instruction_is_dcl(instruction)
-                && instruction->handler_idx != VKD3DSIH_NOP)
+         * phase instruction, and in all other shader types begins with the first label instruction.
+         * Declaring an indexable temp with function scope is not considered a declaration,
+         * because it needs to live inside a function. */
+        if (!after_declarations_section && instruction->handler_idx != VKD3DSIH_NOP)
         {
-            after_declarations_section = true;
-            cf_flattener_emit_label(flattener, cf_flattener_alloc_block_id(flattener));
+            bool is_function_indexable = instruction->handler_idx == VKD3DSIH_DCL_INDEXABLE_TEMP
+                    && instruction->declaration.indexable_temp.has_function_scope;
+
+            if (!vsir_instruction_is_dcl(instruction) || is_function_indexable)
+            {
+                after_declarations_section = true;
+                cf_flattener_emit_label(flattener, cf_flattener_alloc_block_id(flattener));
+            }
         }
 
         cf_info = flattener->control_flow_depth