From 0fcecb97f1f6ca7bdc09b7eb76b817386223052d Mon Sep 17 00:00:00 2001
From: Karmjit Mahil <karmjit.mahil@igalia.com>
Date: Wed, 8 Apr 2026 14:55:17 +0100
Subject: [PATCH] tu: Cleanup some includes

Remove unused includes or heavy includes (e.g. `tu_common.h`) when
we could have done with lighter ones.

iwyu was used to find these cases.

Signed-off-by: Karmjit Mahil <karmjit.mahil@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40853>
---
 src/freedreno/vulkan/tu_acceleration_structure.cc | 1 -
 src/freedreno/vulkan/tu_acceleration_structure.h  | 5 ++++-
 src/freedreno/vulkan/tu_autotune.h                | 2 --
 src/freedreno/vulkan/tu_buffer.h                  | 4 +++-
 src/freedreno/vulkan/tu_buffer_view.cc            | 1 -
 src/freedreno/vulkan/tu_buffer_view.h             | 8 +++++++-
 src/freedreno/vulkan/tu_clear_blit.h              | 8 +++++++-
 src/freedreno/vulkan/tu_descriptor_set.cc         | 6 ++----
 src/freedreno/vulkan/tu_descriptor_set.h          | 1 -
 src/freedreno/vulkan/tu_device.cc                 | 4 ----
 src/freedreno/vulkan/tu_dynamic_rendering.h       | 7 ++++++-
 src/freedreno/vulkan/tu_event.h                   | 3 ++-
 src/freedreno/vulkan/tu_formats.h                 | 7 ++++++-
 src/freedreno/vulkan/tu_image.cc                  | 1 +
 src/freedreno/vulkan/tu_knl.h                     | 7 +++++--
 src/freedreno/vulkan/tu_knl_drm.h                 | 1 +
 src/freedreno/vulkan/tu_perfetto.cc               | 5 -----
 src/freedreno/vulkan/tu_perfetto.h                | 2 +-
 src/freedreno/vulkan/tu_shader.cc                 | 1 +
 19 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/freedreno/vulkan/tu_acceleration_structure.cc b/src/freedreno/vulkan/tu_acceleration_structure.cc
index 702d15e9c7b..2ac23fe5662 100644
--- a/src/freedreno/vulkan/tu_acceleration_structure.cc
+++ b/src/freedreno/vulkan/tu_acceleration_structure.cc
@@ -29,7 +29,6 @@
 #include "vk_acceleration_structure.h"
 
 #include "bvh/tu_build_interface.h"
-#include "common/freedreno_gpu_event.h"
 #include "tu_buffer.h"
 #include "tu_cmd_buffer.h"
 #include "tu_device.h"
diff --git a/src/freedreno/vulkan/tu_acceleration_structure.h b/src/freedreno/vulkan/tu_acceleration_structure.h
index 08a88c61ddf..d31faacad24 100644
--- a/src/freedreno/vulkan/tu_acceleration_structure.h
+++ b/src/freedreno/vulkan/tu_acceleration_structure.h
@@ -6,7 +6,10 @@
 #ifndef TU_ACCELERATION_STRUCT_H
 #define TU_ACCELERATION_STRUCT_H
 
-#include "tu_common.h"
+#include "vk_acceleration_structure.h"
+#include "vulkan/vulkan_core.h"
+
+struct tu_device;
 
 VkResult tu_init_null_accel_struct(struct tu_device *device);
 
diff --git a/src/freedreno/vulkan/tu_autotune.h b/src/freedreno/vulkan/tu_autotune.h
index 5395da043b5..aba8d3e6f95 100644
--- a/src/freedreno/vulkan/tu_autotune.h
+++ b/src/freedreno/vulkan/tu_autotune.h
@@ -6,8 +6,6 @@
 #ifndef TU_AUTOTUNE_H
 #define TU_AUTOTUNE_H
 
-#include "tu_common.h"
-
 #include <atomic>
 #include <deque>
 #include <memory>
diff --git a/src/freedreno/vulkan/tu_buffer.h b/src/freedreno/vulkan/tu_buffer.h
index 9d09113ee39..84efaed0b12 100644
--- a/src/freedreno/vulkan/tu_buffer.h
+++ b/src/freedreno/vulkan/tu_buffer.h
@@ -10,9 +10,11 @@
 #ifndef TU_BUFFER_H
 #define TU_BUFFER_H
 
-#include "tu_common.h"
+#include <stdint.h>
 
 #include "vk_buffer.h"
+#include "vk_object.h"
+#include "vulkan/vulkan_core.h"
 
 #include "tu_knl.h"
 
diff --git a/src/freedreno/vulkan/tu_buffer_view.cc b/src/freedreno/vulkan/tu_buffer_view.cc
index dd0f7097e73..05cc2f86bf7 100644
--- a/src/freedreno/vulkan/tu_buffer_view.cc
+++ b/src/freedreno/vulkan/tu_buffer_view.cc
@@ -7,7 +7,6 @@
 
 #include "tu_buffer.h"
 #include "tu_device.h"
-#include "tu_formats.h"
 
 template <chip CHIP>
 VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/src/freedreno/vulkan/tu_buffer_view.h b/src/freedreno/vulkan/tu_buffer_view.h
index 686e7e21976..940fe6d7b4f 100644
--- a/src/freedreno/vulkan/tu_buffer_view.h
+++ b/src/freedreno/vulkan/tu_buffer_view.h
@@ -6,9 +6,15 @@
 #ifndef TU_BUFFER_VIEW_H
 #define TU_BUFFER_VIEW_H
 
-#include "tu_common.h"
+#include <stdint.h>
 
 #include "vk_buffer_view.h"
+#include "vk_object.h"
+#include "vulkan/vulkan_core.h"
+
+#include "fdl/freedreno_layout.h"
+
+struct tu_buffer;
 
 struct tu_buffer_view
 {
diff --git a/src/freedreno/vulkan/tu_clear_blit.h b/src/freedreno/vulkan/tu_clear_blit.h
index 44c6172c425..1defb044bf9 100644
--- a/src/freedreno/vulkan/tu_clear_blit.h
+++ b/src/freedreno/vulkan/tu_clear_blit.h
@@ -10,7 +10,13 @@
 #ifndef TU_CLEAR_BLIT_H
 #define TU_CLEAR_BLIT_H
 
-#include "tu_common.h"
+#include <stdint.h>
+
+#include "vulkan/vulkan_core.h"
+
+#include "common/fd_hw_common.h"
+
+struct tu_rect2d_float;
 
 void tu_init_clear_blit_shaders(struct tu_device *dev);
 
diff --git a/src/freedreno/vulkan/tu_descriptor_set.cc b/src/freedreno/vulkan/tu_descriptor_set.cc
index 112a774a275..6dab563bea7 100644
--- a/src/freedreno/vulkan/tu_descriptor_set.cc
+++ b/src/freedreno/vulkan/tu_descriptor_set.cc
@@ -19,20 +19,18 @@
 
 #include "tu_descriptor_set.h"
 
-#include <fcntl.h>
-
 #include "util/mesa-blake3.h"
 #include "vk_acceleration_structure.h"
 #include "vk_descriptors.h"
 #include "vk_util.h"
 
-#include "bvh/tu_build_interface.h"
+#include "bvh/tu_bvh.h"
 #include "tu_buffer.h"
 #include "tu_buffer_view.h"
 #include "tu_device.h"
-#include "tu_formats.h"
 #include "tu_image.h"
 #include "tu_rmv.h"
+#include "tu_sampler.h"
 #include "tu_subsampled_image.h"
 
 static inline uint8_t *
diff --git a/src/freedreno/vulkan/tu_descriptor_set.h b/src/freedreno/vulkan/tu_descriptor_set.h
index 7fa39f2c6a2..6a6a1ff9e59 100644
--- a/src/freedreno/vulkan/tu_descriptor_set.h
+++ b/src/freedreno/vulkan/tu_descriptor_set.h
@@ -13,7 +13,6 @@
 
 #include "common/freedreno_pm4.h"
 #include "fdl/fd6_format_table.h"
-#include "tu_sampler.h"
 
 /* The hardware supports up to 8 descriptor sets since A7XX.
  * Note: This is the maximum across generations, not the maximum for a
diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc
index 944b14b1fc6..d41f838b702 100644
--- a/src/freedreno/vulkan/tu_device.cc
+++ b/src/freedreno/vulkan/tu_device.cc
@@ -12,9 +12,6 @@
 #include "drm-uapi/drm_fourcc.h"
 #include "git_sha1.h"
 
-#include <fcntl.h>
-#include <poll.h>
-
 #include "common/freedreno_stompable_regs.h"
 /* for fd_get_driver/device_uuid() */
 #include "util/cache_ops.h"
@@ -26,7 +23,6 @@
 #include "util/u_process.h"
 #include "vk_android.h"
 #include "vk_debug_utils.h"
-#include "vk_sampler.h"
 #include "vk_shader_module.h"
 #include "vk_util.h"
 
diff --git a/src/freedreno/vulkan/tu_dynamic_rendering.h b/src/freedreno/vulkan/tu_dynamic_rendering.h
index 3551264a3d6..504a726b5cd 100644
--- a/src/freedreno/vulkan/tu_dynamic_rendering.h
+++ b/src/freedreno/vulkan/tu_dynamic_rendering.h
@@ -10,7 +10,12 @@
 #ifndef TU_DYNAMIC_RENDERING_H
 #define TU_DYNAMIC_RENDERING_H
 
-#include "tu_common.h"
+#include <stdint.h>
+
+#include "vulkan/vulkan_core.h"
+
+struct tu_device;
+struct tu_cmd_buffer;
 
 VkResult tu_init_dynamic_rendering(struct tu_device *dev);
 
diff --git a/src/freedreno/vulkan/tu_event.h b/src/freedreno/vulkan/tu_event.h
index 43e3f6cb2a7..ec86eb0e5d6 100644
--- a/src/freedreno/vulkan/tu_event.h
+++ b/src/freedreno/vulkan/tu_event.h
@@ -10,7 +10,8 @@
 #ifndef TU_EVENT_H
 #define TU_EVENT_H
 
-#include "tu_common.h"
+#include "vk_object.h"
+#include "vulkan/vulkan_core.h"
 
 #include "tu_suballoc.h"
 
diff --git a/src/freedreno/vulkan/tu_formats.h b/src/freedreno/vulkan/tu_formats.h
index 81892b9fac8..ef26f6bdfaf 100644
--- a/src/freedreno/vulkan/tu_formats.h
+++ b/src/freedreno/vulkan/tu_formats.h
@@ -10,7 +10,12 @@
 #ifndef TU_FORMATS_H
 #define TU_FORMATS_H
 
-#include "tu_common.h"
+#include <stdbool.h>
+
+#include "util/format/u_format.h"
+#include "vulkan/vulkan_core.h"
+
+#include "common/fd6_hw.h"
 
 struct tu_native_format
 {
diff --git a/src/freedreno/vulkan/tu_image.cc b/src/freedreno/vulkan/tu_image.cc
index 6411aaccfd2..344dc529eb8 100644
--- a/src/freedreno/vulkan/tu_image.cc
+++ b/src/freedreno/vulkan/tu_image.cc
@@ -16,6 +16,7 @@
 #include "vk_android.h"
 #include "vk_debug_utils.h"
 #include "vk_util.h"
+#include "vk_ycbcr_conversion.h"
 #include "vulkan/vulkan_core.h"
 
 #include "common/freedreno_lrz.h"
diff --git a/src/freedreno/vulkan/tu_knl.h b/src/freedreno/vulkan/tu_knl.h
index d0b2067a4f2..4c2bf6a41a7 100644
--- a/src/freedreno/vulkan/tu_knl.h
+++ b/src/freedreno/vulkan/tu_knl.h
@@ -10,11 +10,14 @@
 #ifndef TU_DRM_H
 #define TU_DRM_H
 
-#include "tu_common.h"
+#include <stddef.h>
+#include <stdint.h>
 
-#include "tu_queue.h"
+#include "util/u_atomic.h"
+#include "vulkan/vulkan_core.h"
 
 struct tu_u_trace_syncobj;
+struct tu_queue;
 struct vdrm_bo;
 
 enum tu_bo_alloc_flags {
diff --git a/src/freedreno/vulkan/tu_knl_drm.h b/src/freedreno/vulkan/tu_knl_drm.h
index d72e8049444..2c296f26f46 100644
--- a/src/freedreno/vulkan/tu_knl_drm.h
+++ b/src/freedreno/vulkan/tu_knl_drm.h
@@ -10,6 +10,7 @@
 #include "drm-uapi/msm_drm.h"
 
 #include "util/timespec.h"
+#include "util/u_dynarray.h"
 #include "vk_util.h"
 
 #include "tu_knl.h"
diff --git a/src/freedreno/vulkan/tu_perfetto.cc b/src/freedreno/vulkan/tu_perfetto.cc
index 3b78338b525..218059bcff2 100644
--- a/src/freedreno/vulkan/tu_perfetto.cc
+++ b/src/freedreno/vulkan/tu_perfetto.cc
@@ -7,14 +7,9 @@
 
 #include <perfetto.h>
 
-#include "util/hash_table.h"
-#include "util/perf/u_perfetto.h"
 #include "util/perf/u_perfetto_renderpass.h"
-#include "vk_object.h"
-#include "vk_util.h"
 
 #include "tu_buffer.h"
-#include "tu_cmd_buffer.h"
 #include "tu_device.h"
 #include "tu_image.h"
 #include "tu_queue.h"
diff --git a/src/freedreno/vulkan/tu_perfetto.h b/src/freedreno/vulkan/tu_perfetto.h
index e8db3a5414c..aea6cc461b3 100644
--- a/src/freedreno/vulkan/tu_perfetto.h
+++ b/src/freedreno/vulkan/tu_perfetto.h
@@ -10,9 +10,9 @@
 
 /* we can't include tu_common.h because ir3 headers are not C++-compatible */
 #include <stdint.h>
-#include <vulkan/vulkan.h>
 
 #include "c11/threads.h"
+#include "vulkan/vulkan_core.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/freedreno/vulkan/tu_shader.cc b/src/freedreno/vulkan/tu_shader.cc
index a3bdf7d1b3e..ac0bae6bda9 100644
--- a/src/freedreno/vulkan/tu_shader.cc
+++ b/src/freedreno/vulkan/tu_shader.cc
@@ -22,6 +22,7 @@
 #include "tu_lrz.h"
 #include "tu_pipeline.h"
 #include "tu_rmv.h"
+#include "tu_sampler.h"
 #include "tu_subsampled_image.h"
 
 static void