Mesa (staging/21.2): aco: include utility in isel

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 0ff8559d9f7cd48828fc220c8e82a66bd9ad68a0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ff8559d9f7cd48828fc220c8e82a66bd9ad68a0

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Mon Aug 30 10:42:34 2021 +0100

aco: include utility in isel

For std::exchange().

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Fixes: c1d11bb92c9 ("aco: Add loop creation helpers.")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5301
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12614>
(cherry picked from commit 9df9fe7dfaee84a7152e3d0c0e7bc62db1e5d889)

---

 .pick_status.json                              | 2 +-
 src/amd/compiler/aco_instruction_selection.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index dee95fc0a4c..05bc7c88f48 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13,7 +13,7 @@
         "description": "aco: include utility in isel",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c1d11bb92c95e0fc56a1280acc15893623769ff9"
     },
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index ccf50faa157..2d1bb85e230 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -40,6 +40,7 @@
 #include <map>
 #include <numeric>
 #include <stack>
+#include <utility>
 #include <vector>
 
 namespace aco {