Please use the Gitlab MR feature for future ACO patches.
That said, thx for the fix!
Reviewed-by: Daniel Schürmann <dan...@schuermann.dev>
On 22.09.19 14:38, mesa-dev-requ...@lists.freedesktop.org wrote:
Date: Sun, 22 Sep 2019 12:00:24 +0200
From: Mauro Rossi<issor.or...@gmail.com>
To:mesa-dev@lists.freedesktop.org
Cc:dan...@schuermann.dev,samuel.pitoi...@gmail.com,
b...@basnieuwenhuizen.nl, Mauro Rossi<issor.or...@gmail.com>
Subject: [Mesa-dev] [PATCH 1/3] android: aco: fix undefined template
'std::__1::array' build errors
Message-ID:<20190922100026.20134-1-issor.or...@gmail.com>
Fixes a few building errors similar to the following:
In file included from
external/mesa/src/amd/compiler/aco_instruction_selection.cpp:26:
In file included from external/libcxx/include/algorithm:639:
external/libcxx/include/utility:321:9:
error: implicit instantiation of undefined template 'std::__1::array<aco::Temp,
4>'
_T2 second;
^
Fixes: 93c8ebf ("aco: Initial commit of independent AMD compiler")
Signed-off-by: Mauro Rossi<issor.or...@gmail.com>
---
src/amd/compiler/aco_instruction_selection.cpp | 1 +
src/amd/compiler/aco_instruction_selection_setup.cpp | 1 +
src/amd/compiler/aco_print_asm.cpp | 2 +-
src/amd/compiler/aco_register_allocation.cpp | 1 +
src/amd/compiler/aco_validate.cpp | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/amd/compiler/aco_instruction_selection.cpp
b/src/amd/compiler/aco_instruction_selection.cpp
index d52043f3c0..164ac8ed5d 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -24,6 +24,7 @@
*/
#include <algorithm>
+#include <array>
#include <map>
#include "aco_ir.h"
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp
b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 6c4c408e65..e8522c3d12 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -22,6 +22,7 @@
*
*/
+#include <array>
#include <unordered_map>
#include "aco_ir.h"
#include "nir.h"
diff --git a/src/amd/compiler/aco_print_asm.cpp
b/src/amd/compiler/aco_print_asm.cpp
index 31079aa1c4..d3f4c3cb40 100644
--- a/src/amd/compiler/aco_print_asm.cpp
+++ b/src/amd/compiler/aco_print_asm.cpp
@@ -1,4 +1,4 @@
-
+#include <array>
#include <iomanip>
#include "aco_ir.h"
#include "llvm-c/Disassembler.h"
diff --git a/src/amd/compiler/aco_register_allocation.cpp
b/src/amd/compiler/aco_register_allocation.cpp
index d55f1febc6..47ea932f11 100644
--- a/src/amd/compiler/aco_register_allocation.cpp
+++ b/src/amd/compiler/aco_register_allocation.cpp
@@ -27,6 +27,7 @@
*/
#include <algorithm>
+#include <array>
#include <map>
#include <unordered_map>
#include <functional>
diff --git a/src/amd/compiler/aco_validate.cpp
b/src/amd/compiler/aco_validate.cpp
index 0988d66df3..9919d0a585 100644
--- a/src/amd/compiler/aco_validate.cpp
+++ b/src/amd/compiler/aco_validate.cpp
@@ -24,6 +24,7 @@
#include "aco_ir.h"
+#include <array>
#include <map>
namespace aco {
-- 2.20.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
