From 015e5080e9a3916c4baa434852708c99e4bab40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
Date: Thu, 9 Jan 2025 16:07:17 -0600
Subject: [PATCH] ac: Stop including nir.h in ac_shader_util.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32966>
---
 src/amd/common/ac_gpu_info.c                      | 1 +
 src/amd/common/ac_shader_util.h                   | 1 -
 src/gallium/drivers/radeonsi/si_shader_internal.h | 3 +++
 src/gallium/drivers/radeonsi/si_state.c           | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index f47be78726a..86b4578a1cd 100644
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <inttypes.h>
 
 #define AMDGPU_MI100_RANGE       0x32, 0x3C
 #define AMDGPU_MI200_RANGE       0x3C, 0x46
diff --git a/src/amd/common/ac_shader_util.h b/src/amd/common/ac_shader_util.h
index ccee4839e6e..b972dc7dd05 100644
--- a/src/amd/common/ac_shader_util.h
+++ b/src/amd/common/ac_shader_util.h
@@ -9,7 +9,6 @@
 
 #include "ac_binary.h"
 #include "amd_family.h"
-#include "compiler/nir/nir.h"
 #include "compiler/shader_enums.h"
 #include "util/format/u_format.h"
 
diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h
index 52582dcdac4..3a213be5f39 100644
--- a/src/gallium/drivers/radeonsi/si_shader_internal.h
+++ b/src/gallium/drivers/radeonsi/si_shader_internal.h
@@ -117,6 +117,9 @@ bool gfx10_ngg_export_prim_early(struct si_shader *shader);
 unsigned gfx10_ngg_get_scratch_dw_size(struct si_shader *shader);
 bool gfx10_ngg_calculate_subgroup_info(struct si_shader *shader);
 
+struct nir_def;
+typedef struct nir_def nir_def;
+
 /* si_nir_lower_abi.c */
 nir_def *si_nir_load_internal_binding(nir_builder *b, struct si_shader_args *args,
                                           unsigned slot, unsigned num_components);
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index fd66b895c32..f5a52c9cb23 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -11,6 +11,7 @@
 #include "util/fast_idiv_by_const.h"
 #include "util/format/u_format.h"
 #include "util/format/u_format_s3tc.h"
+#include "util/hash_table.h"
 #include "util/u_dual_blend.h"
 #include "util/u_helpers.h"
 #include "util/u_memory.h"