From 120469efeae2b22a3e301137d53d43133d2c511c Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 1 Aug 2022 13:03:30 -0700 Subject: [PATCH] turnip: remove includes that are already in tu_common.h Part-of: --- src/freedreno/vulkan/tu_android.c | 3 --- src/freedreno/vulkan/tu_autotune.c | 2 -- src/freedreno/vulkan/tu_autotune.h | 1 - src/freedreno/vulkan/tu_clear_blit.c | 1 - src/freedreno/vulkan/tu_cmd_buffer.c | 4 ---- src/freedreno/vulkan/tu_cs.h | 3 --- src/freedreno/vulkan/tu_descriptor_set.c | 4 ---- src/freedreno/vulkan/tu_descriptor_set.h | 2 -- src/freedreno/vulkan/tu_device.c | 5 ----- src/freedreno/vulkan/tu_drm.c | 2 -- src/freedreno/vulkan/tu_formats.c | 3 --- src/freedreno/vulkan/tu_image.c | 2 -- src/freedreno/vulkan/tu_kgsl.c | 1 - src/freedreno/vulkan/tu_pass.c | 1 - src/freedreno/vulkan/tu_pipeline.c | 2 -- src/freedreno/vulkan/tu_query.c | 8 -------- src/freedreno/vulkan/tu_util.c | 4 ---- src/freedreno/vulkan/tu_util.h | 9 --------- src/freedreno/vulkan/tu_wsi.c | 1 - 19 files changed, 58 deletions(-) diff --git a/src/freedreno/vulkan/tu_android.c b/src/freedreno/vulkan/tu_android.c index e526ddd371f..6317cc31f4c 100644 --- a/src/freedreno/vulkan/tu_android.c +++ b/src/freedreno/vulkan/tu_android.c @@ -32,9 +32,6 @@ #include #include -#include -#include - #include "drm-uapi/drm_fourcc.h" #include "util/libsync.h" diff --git a/src/freedreno/vulkan/tu_autotune.c b/src/freedreno/vulkan/tu_autotune.c index 9037a396eef..a18477d5394 100644 --- a/src/freedreno/vulkan/tu_autotune.c +++ b/src/freedreno/vulkan/tu_autotune.c @@ -21,8 +21,6 @@ * SOFTWARE. */ -#include - #include "tu_autotune.h" #include "tu_private.h" #include "tu_cs.h" diff --git a/src/freedreno/vulkan/tu_autotune.h b/src/freedreno/vulkan/tu_autotune.h index 4d42b398db4..c8954c41b0d 100644 --- a/src/freedreno/vulkan/tu_autotune.h +++ b/src/freedreno/vulkan/tu_autotune.h @@ -27,7 +27,6 @@ #include "tu_common.h" #include "util/hash_table.h" -#include "util/list.h" #include "util/rwlock.h" struct tu_device; diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c index 3272f9c5bce..9aa8f540971 100644 --- a/src/freedreno/vulkan/tu_clear_blit.c +++ b/src/freedreno/vulkan/tu_clear_blit.c @@ -9,7 +9,6 @@ #include "tu_private.h" #include "tu_cs.h" -#include "vk_format.h" #include "ir3/ir3_nir.h" diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index b89e03abd1a..b851e520fdb 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -27,10 +27,6 @@ #include "tu_private.h" -#include "adreno_pm4.xml.h" -#include "adreno_common.xml.h" - -#include "vk_format.h" #include "vk_render_pass.h" #include "vk_util.h" diff --git a/src/freedreno/vulkan/tu_cs.h b/src/freedreno/vulkan/tu_cs.h index 60ea5938776..1c024ec82e1 100644 --- a/src/freedreno/vulkan/tu_cs.h +++ b/src/freedreno/vulkan/tu_cs.h @@ -25,8 +25,6 @@ #include "tu_private.h" -#include "adreno_pm4.xml.h" - #include "freedreno_pm4.h" /* For breadcrumbs we may open a network socket based on the envvar, @@ -341,7 +339,6 @@ tu_cond_exec_end(struct tu_cs *cs) #define fd_reg_pair tu_reg_value #define __bo_type struct tu_bo * -#include "a6xx.xml.h" #include "a6xx-pack.xml.h" #define __assert_eq(a, b) \ diff --git a/src/freedreno/vulkan/tu_descriptor_set.c b/src/freedreno/vulkan/tu_descriptor_set.c index b40c3f7f590..fb809d565f6 100644 --- a/src/freedreno/vulkan/tu_descriptor_set.c +++ b/src/freedreno/vulkan/tu_descriptor_set.c @@ -37,11 +37,7 @@ #include "tu_private.h" -#include #include -#include -#include -#include #include "util/mesa-sha1.h" #include "vk_descriptors.h" diff --git a/src/freedreno/vulkan/tu_descriptor_set.h b/src/freedreno/vulkan/tu_descriptor_set.h index f08f0b30245..d2b6074e2e2 100644 --- a/src/freedreno/vulkan/tu_descriptor_set.h +++ b/src/freedreno/vulkan/tu_descriptor_set.h @@ -26,8 +26,6 @@ #include "tu_common.h" -#include - /* The hardware supports 5 descriptor sets, but we reserve 1 for dynamic * descriptors and input attachments. */ diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index 5a26ec97194..444479665f7 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -32,17 +32,12 @@ #include #include -#include -#include #include -#include #include "util/debug.h" #include "util/disk_cache.h" #include "util/driconf.h" #include "util/os_misc.h" -#include "util/u_atomic.h" -#include "vk_format.h" #include "vk_sampler.h" #include "vk_util.h" diff --git a/src/freedreno/vulkan/tu_drm.c b/src/freedreno/vulkan/tu_drm.c index 6f6688366a7..f16ad3dfa1f 100644 --- a/src/freedreno/vulkan/tu_drm.c +++ b/src/freedreno/vulkan/tu_drm.c @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -42,7 +41,6 @@ #include "util/debug.h" #include "util/timespec.h" #include "util/os_time.h" -#include "util/perf/u_trace.h" #include "tu_private.h" diff --git a/src/freedreno/vulkan/tu_formats.c b/src/freedreno/vulkan/tu_formats.c index 3465735a1c5..6fc3fa45ce3 100644 --- a/src/freedreno/vulkan/tu_formats.c +++ b/src/freedreno/vulkan/tu_formats.c @@ -25,11 +25,8 @@ #include "tu_private.h" -#include "adreno_common.xml.h" -#include "a6xx.xml.h" #include "fdl/fd6_format_table.h" -#include "vk_format.h" #include "vk_util.h" #include "drm-uapi/drm_fourcc.h" diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c index 33527ad8a85..f6ca6bbe8ad 100644 --- a/src/freedreno/vulkan/tu_image.c +++ b/src/freedreno/vulkan/tu_image.c @@ -29,9 +29,7 @@ #include "fdl/fd6_format_table.h" #include "util/debug.h" -#include "util/u_atomic.h" #include "util/format/u_format.h" -#include "vk_format.h" #include "vk_util.h" #include "drm-uapi/drm_fourcc.h" diff --git a/src/freedreno/vulkan/tu_kgsl.c b/src/freedreno/vulkan/tu_kgsl.c index 08f08910518..686cc8cbd72 100644 --- a/src/freedreno/vulkan/tu_kgsl.c +++ b/src/freedreno/vulkan/tu_kgsl.c @@ -25,7 +25,6 @@ #include #include -#include #include #include diff --git a/src/freedreno/vulkan/tu_pass.c b/src/freedreno/vulkan/tu_pass.c index c2cbcca3de5..c5c1d564c10 100644 --- a/src/freedreno/vulkan/tu_pass.c +++ b/src/freedreno/vulkan/tu_pass.c @@ -27,7 +27,6 @@ #include "tu_private.h" #include "vk_util.h" -#include "vk_format.h" /* Return true if we have to fallback to sysmem rendering because the * dependency can't be satisfied with tiled rendering. diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index 7f0e8e793f0..01c3f84a1ff 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -35,8 +35,6 @@ #include "spirv/nir_spirv.h" #include "util/debug.h" #include "util/mesa-sha1.h" -#include "util/u_atomic.h" -#include "vk_format.h" #include "vk_pipeline.h" #include "vk_render_pass.h" #include "vk_util.h" diff --git a/src/freedreno/vulkan/tu_query.c b/src/freedreno/vulkan/tu_query.c index 6f99d377856..fcb17b68215 100644 --- a/src/freedreno/vulkan/tu_query.c +++ b/src/freedreno/vulkan/tu_query.c @@ -25,15 +25,7 @@ #include "tu_private.h" -#include #include -#include -#include -#include - -#include "adreno_pm4.xml.h" -#include "adreno_common.xml.h" -#include "a6xx.xml.h" #include "nir/nir_builder.h" #include "util/os_time.h" diff --git a/src/freedreno/vulkan/tu_util.c b/src/freedreno/vulkan/tu_util.c index 970c8a4fe67..9bd66efb43d 100644 --- a/src/freedreno/vulkan/tu_util.c +++ b/src/freedreno/vulkan/tu_util.c @@ -23,12 +23,8 @@ #include "tu_private.h" -#include #include #include -#include -#include -#include #include "util/u_math.h" #include "util/timespec.h" diff --git a/src/freedreno/vulkan/tu_util.h b/src/freedreno/vulkan/tu_util.h index f7af2a8042d..a9e47aba3c0 100644 --- a/src/freedreno/vulkan/tu_util.h +++ b/src/freedreno/vulkan/tu_util.h @@ -11,20 +11,11 @@ #include "tu_common.h" -#include -#include - -#include "util/macros.h" #include "util/u_math.h" #include "util/format/u_format_pack.h" #include "util/format/u_format_zs.h" #include "compiler/shader_enums.h" -#include "adreno_common.xml.h" -#include "adreno_pm4.xml.h" -#include "a6xx.xml.h" - -#include #include "vk_util.h" #define TU_STAGE_MASK ((1 << MESA_SHADER_STAGES) - 1) diff --git a/src/freedreno/vulkan/tu_wsi.c b/src/freedreno/vulkan/tu_wsi.c index 69a81a14112..bf8cb9a8f09 100644 --- a/src/freedreno/vulkan/tu_wsi.c +++ b/src/freedreno/vulkan/tu_wsi.c @@ -26,7 +26,6 @@ #include "tu_private.h" #include "vk_util.h" -#include "wsi_common.h" #include "wsi_common_drm.h" #include "drm-uapi/drm_fourcc.h"