From 8c6ea5a6ffddd94cbdd5071d18b323f2e63b98c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 2 Oct 2016 17:52:46 +0200 Subject: [PATCH] radeonsi: remove unnecessary #includes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle Reviewed-by: Edward O'Callaghan --- src/gallium/drivers/radeonsi/cik_sdma.c | 3 --- src/gallium/drivers/radeonsi/si_compute.c | 2 -- src/gallium/drivers/radeonsi/si_debug.c | 1 - src/gallium/drivers/radeonsi/si_descriptors.c | 3 --- src/gallium/drivers/radeonsi/si_dma.c | 1 - src/gallium/drivers/radeonsi/si_perfcounter.c | 1 - src/gallium/drivers/radeonsi/si_pipe.c | 1 - src/gallium/drivers/radeonsi/si_shader.c | 5 ----- src/gallium/drivers/radeonsi/si_state.c | 2 -- src/gallium/drivers/radeonsi/si_state_draw.c | 2 -- src/gallium/drivers/radeonsi/si_state_shaders.c | 2 -- 11 files changed, 23 deletions(-) diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c index d15d8dc..141fb01 100644 --- a/src/gallium/drivers/radeonsi/cik_sdma.c +++ b/src/gallium/drivers/radeonsi/cik_sdma.c @@ -27,9 +27,6 @@ #include "sid.h" #include "si_pipe.h" -#include "radeon/r600_cs.h" - -#include "util/u_format.h" static void cik_sdma_do_copy_buffer(struct si_context *ctx, struct pipe_resource *dst, diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index ad9cb7a..9a5a4a9 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -25,13 +25,11 @@ #include "tgsi/tgsi_parse.h" #include "util/u_memory.h" #include "util/u_upload_mgr.h" -#include "radeon/r600_pipe_common.h" #include "radeon/radeon_elf_util.h" #include "amd_kernel_code_t.h" #include "radeon/r600_cs.h" #include "si_pipe.h" -#include "si_shader.h" #include "sid.h" #define MAX_GLOBAL_BUFFERS 20 diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index d172867..3de7c71 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -25,7 +25,6 @@ */ #include "si_pipe.h" -#include "si_shader.h" #include "sid.h" #include "sid_tables.h" #include "radeon/radeon_elf_util.h" diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 26e7beb..350242a 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -57,13 +57,10 @@ #include "radeon/r600_cs.h" #include "si_pipe.h" -#include "si_shader.h" #include "sid.h" #include "util/u_format.h" -#include "util/u_math.h" #include "util/u_memory.h" -#include "util/u_suballoc.h" #include "util/u_upload_mgr.h" diff --git a/src/gallium/drivers/radeonsi/si_dma.c b/src/gallium/drivers/radeonsi/si_dma.c index 4291361..3df52bd 100644 --- a/src/gallium/drivers/radeonsi/si_dma.c +++ b/src/gallium/drivers/radeonsi/si_dma.c @@ -26,7 +26,6 @@ #include "sid.h" #include "si_pipe.h" -#include "radeon/r600_cs.h" #include "util/u_format.h" diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c index 0f5c28c..5e0bf3f 100644 --- a/src/gallium/drivers/radeonsi/si_perfcounter.c +++ b/src/gallium/drivers/radeonsi/si_perfcounter.c @@ -27,7 +27,6 @@ #include "radeon/r600_cs.h" #include "radeon/r600_query.h" -#include "radeon/r600_pipe_common.h" #include "util/u_memory.h" #include "si_pipe.h" diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 60ef548..43d6377 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -22,7 +22,6 @@ */ #include "si_pipe.h" -#include "si_shader.h" #include "si_public.h" #include "sid.h" diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 3ccff7a..7d1a684 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -31,25 +31,20 @@ #include "gallivm/lp_bld_intr.h" #include "gallivm/lp_bld_logic.h" #include "gallivm/lp_bld_arit.h" -#include "gallivm/lp_bld_bitarit.h" #include "gallivm/lp_bld_flow.h" #include "gallivm/lp_bld_misc.h" -#include "radeon/r600_cs.h" #include "radeon/radeon_llvm.h" #include "radeon/radeon_elf_util.h" #include "radeon/radeon_llvm_emit.h" #include "util/u_memory.h" #include "util/u_string.h" -#include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_build.h" #include "tgsi/tgsi_util.h" #include "tgsi/tgsi_dump.h" #include "si_pipe.h" -#include "si_shader.h" #include "sid.h" -#include static const char *scratch_rsrc_dword0_symbol = "SCRATCH_RSRC_DWORD0"; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index e3de572..ddf6cfe 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -25,7 +25,6 @@ */ #include "si_pipe.h" -#include "si_shader.h" #include "sid.h" #include "radeon/r600_cs.h" #include "radeon/r600_query.h" @@ -34,7 +33,6 @@ #include "util/u_format.h" #include "util/u_format_s3tc.h" #include "util/u_memory.h" -#include "util/u_pstipple.h" #include "util/u_resource.h" /* Initialize an external atom (owned by ../radeon). */ diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 051ea9e..38e5cb4 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -25,14 +25,12 @@ */ #include "si_pipe.h" -#include "si_shader.h" #include "radeon/r600_cs.h" #include "sid.h" #include "util/u_index_modify.h" #include "util/u_upload_mgr.h" #include "util/u_prim.h" -#include "util/u_memory.h" static unsigned si_conv_pipe_prim(unsigned mode) { diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index acbceba..9662625 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -26,7 +26,6 @@ */ #include "si_pipe.h" -#include "si_shader.h" #include "sid.h" #include "radeon/r600_cs.h" @@ -36,7 +35,6 @@ #include "util/u_hash.h" #include "util/u_memory.h" #include "util/u_prim.h" -#include "util/u_simple_shaders.h" /* SHADER_CACHE */ -- 2.7.4