From dbbe7437436ebe3ea8d28ad846f30c314f5977c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daniel@schuermann.dev>
Date: Mon, 4 Sep 2023 09:46:25 +0200
Subject: [PATCH] aco/insert_exec_mask: set Exact mode after p_discard_if when
 necessary

Fixes: 5e9df85b1a4504c5b4162e77e139056dc80accc6 ('aco: optimize discard_if when WQM is not needed afterwards')
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25038>
(cherry picked from commit 0907b53740a456d769d7ad26f071d7610abb9918)
---
 .pick_status.json                         | 2 +-
 src/amd/compiler/aco_insert_exec_mask.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2c653815034..96481bd63ea 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1678,7 +1678,7 @@
         "description": "aco/insert_exec_mask: set Exact mode after p_discard_if when necessary",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "5e9df85b1a4504c5b4162e77e139056dc80accc6"
     },
diff --git a/src/amd/compiler/aco_insert_exec_mask.cpp b/src/amd/compiler/aco_insert_exec_mask.cpp
index 5c48e0357cd..41a2a16f47e 100644
--- a/src/amd/compiler/aco_insert_exec_mask.cpp
+++ b/src/amd/compiler/aco_insert_exec_mask.cpp
@@ -577,6 +577,7 @@ process_instructions(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instructio
                assert(ctx.info[block->index].exec[0].second == (mask_type_exact | mask_type_global));
                current_exec = get_exec_op(ctx.info[block->index].exec.back().first);
                ctx.info[block->index].exec[0].first = Operand(bld.lm);
+               state = Exact;
             }
          }