From 87de5b2b9e313f9939c2c550afe1adf8d1bde6b4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
Date: Fri, 3 Mar 2023 11:52:52 -0800
Subject: [PATCH] aco: Don't include headers from radv.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21696>
---
 src/amd/compiler/aco_assembler.cpp                   |  1 +
 src/amd/compiler/aco_instruction_selection_setup.cpp |  3 +--
 src/amd/compiler/aco_ir.h                            |  6 +++---
 src/amd/compiler/tests/framework.h                   | 15 ++++++++-------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 9ff96bf..342502a 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -29,6 +29,7 @@
 
 #include "util/memstream.h"
 
+#include "ac_shader_util.h"
 #include <algorithm>
 #include <map>
 #include <vector>
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index df59b63..7fade69 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -26,7 +26,6 @@
 
 #include "common/ac_nir.h"
 #include "common/sid.h"
-#include "vulkan/radv_descriptor_set.h"
 
 #include "nir_control_flow.h"
 
@@ -399,7 +398,7 @@ init_context(isel_context* ctx, nir_shader* shader)
    ctx->ub_config.max_workgroup_size[0] = 2048;
    ctx->ub_config.max_workgroup_size[1] = 2048;
    ctx->ub_config.max_workgroup_size[2] = 2048;
-   for (unsigned i = 0; i < MAX_VERTEX_ATTRIBS; i++) {
+   for (unsigned i = 0; i < ACO_MAX_VERTEX_ATTRIBS; i++) {
       pipe_format format = (pipe_format)ctx->options->key.vs.vertex_attribute_formats[i];
       const struct util_format_description* desc = util_format_description(format);
 
diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h
index a44eafd..bb39229 100644
--- a/src/amd/compiler/aco_ir.h
+++ b/src/amd/compiler/aco_ir.h
@@ -25,14 +25,14 @@
 #ifndef ACO_IR_H
 #define ACO_IR_H
 
-#include "aco_opcodes.h"
-#include "aco_util.h"
 #include "aco_interface.h"
+#include "aco_opcodes.h"
 #include "aco_shader_info.h"
-#include "vulkan/radv_shader.h"
+#include "aco_util.h"
 
 #include "nir.h"
 
+#include "ac_binary.h"
 #include <algorithm>
 #include <bitset>
 #include <memory>
diff --git a/src/amd/compiler/tests/framework.h b/src/amd/compiler/tests/framework.h
index f2614f6..76a17e2 100644
--- a/src/amd/compiler/tests/framework.h
+++ b/src/amd/compiler/tests/framework.h
@@ -23,15 +23,16 @@
  */
 #ifndef ACO_TEST_COMMON_H
 #define ACO_TEST_COMMON_H
-#include <map>
-#include <string>
-#include <stdio.h>
-
-#include "amd_family.h"
-#include "aco_ir.h"
 #include "aco_builder.h"
+#include "aco_ir.h"
+
 #include "util/macros.h"
-#include "vulkan/radv_shader.h"
+
+#include "ac_shader_util.h"
+#include "amd_family.h"
+#include <map>
+#include <stdio.h>
+#include <string>
 
 struct TestDef {
    const char *name;
-- 
2.7.4