From 7bd40dc2f218e10188eca0d4baec1ae3bb52a120 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 21 Jun 2018 18:03:06 -0400 Subject: [PATCH] radeonsi: clean up some #includes Reviewed-by: Timothy Arceri --- src/gallium/drivers/radeonsi/si_pipe.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.h | 1 - src/gallium/drivers/radeonsi/si_shader.c | 6 +----- src/gallium/drivers/radeonsi/si_shader_internal.h | 2 -- src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c | 4 ---- src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c | 2 +- .../drivers/radeonsi/si_shader_tgsi_setup.c | 14 +------------- 7 files changed, 4 insertions(+), 27 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 8f16b2bf8e6..b64c41f4fe6 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -28,10 +28,10 @@ #include "si_shader_internal.h" #include "sid.h" +#include "ac_llvm_util.h" #include "radeon/radeon_uvd.h" #include "gallivm/lp_bld_misc.h" #include "util/disk_cache.h" -#include "util/hash_table.h" #include "util/u_log.h" #include "util/u_memory.h" #include "util/u_suballoc.h" diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index d73ee600443..a4da98c6369 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -30,7 +30,6 @@ #include "util/u_dynarray.h" #include "util/u_idalloc.h" -#include "util/u_range.h" #include "util/u_threaded_context.h" #ifdef PIPE_ARCH_BIG_ENDIAN diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index af52558efe1..ca145744244 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -25,20 +25,16 @@ #include "gallivm/lp_bld_const.h" #include "gallivm/lp_bld_gather.h" #include "gallivm/lp_bld_intr.h" -#include "gallivm/lp_bld_logic.h" #include "gallivm/lp_bld_arit.h" -#include "gallivm/lp_bld_flow.h" -#include "gallivm/lp_bld_misc.h" #include "util/u_memory.h" #include "util/u_string.h" #include "tgsi/tgsi_build.h" #include "tgsi/tgsi_util.h" #include "tgsi/tgsi_dump.h" -#include "ac_binary.h" -#include "ac_llvm_util.h" #include "ac_exp_param.h" #include "ac_shader_util.h" +#include "ac_llvm_util.h" #include "si_shader_internal.h" #include "si_pipe.h" #include "sid.h" diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h index e528a56023f..5c275ab6d9f 100644 --- a/src/gallium/drivers/radeonsi/si_shader_internal.h +++ b/src/gallium/drivers/radeonsi/si_shader_internal.h @@ -31,8 +31,6 @@ #include "gallivm/lp_bld_tgsi.h" #include "tgsi/tgsi_parse.h" #include "ac_shader_abi.h" -#include "ac_llvm_util.h" -#include "ac_llvm_build.h" #include #include diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c index 207f552d2d9..06e773a77f1 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c @@ -23,11 +23,7 @@ */ #include "si_shader_internal.h" -#include "gallivm/lp_bld_const.h" #include "gallivm/lp_bld_intr.h" -#include "gallivm/lp_bld_gather.h" -#include "tgsi/tgsi_parse.h" -#include "amd/common/ac_llvm_build.h" static void kill_if_fetch_args(struct lp_build_tgsi_context *bld_base, struct lp_build_emit_data *emit_data) diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c index d36ccf78905..59f2dbf0d60 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c @@ -29,8 +29,8 @@ #include "gallivm/lp_bld_gather.h" #include "gallivm/lp_bld_intr.h" #include "tgsi/tgsi_build.h" -#include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_util.h" +#include "ac_llvm_util.h" static void build_tex_intrinsic(const struct lp_build_tgsi_action *action, struct lp_build_tgsi_context *bld_base, diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c index 43bc97006c2..63710b1180c 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c @@ -24,21 +24,9 @@ #include "si_shader_internal.h" #include "si_pipe.h" - -#include "gallivm/lp_bld_const.h" +#include "ac_llvm_util.h" #include "gallivm/lp_bld_gather.h" -#include "gallivm/lp_bld_flow.h" -#include "gallivm/lp_bld_init.h" -#include "gallivm/lp_bld_intr.h" -#include "gallivm/lp_bld_misc.h" -#include "gallivm/lp_bld_swizzle.h" -#include "tgsi/tgsi_info.h" -#include "tgsi/tgsi_parse.h" -#include "util/u_math.h" #include "util/u_memory.h" -#include "util/u_debug.h" - -#include enum si_llvm_calling_convention { RADEON_LLVM_AMDGPU_VS = 87, -- 2.30.2