gallium/radeon: cleanup header inclusion

 - Add top_srcdir/src/gallium/winsys to GALLIUM_DRIVER_C{XXFLAGS}.
 - Remove top_srcdir/src/gallium/drivers/radeon from the includes.

As a result:
 - Common radeon headers are prefixed with 'radeon/'
 - Winsys header inclusion is prefixed 'radeon/drm'

Cc: Marek Olšák <marek.olsak@amd.com>
Cc: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 74053eb2d8293911f0fdeb0c3a68e3302019f2dd..c43f735c3f372c1eaf573345016d49142a64b2e7 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -16,6 +16,7 @@ GALLIUM_DRIVER_CFLAGS = \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/src/gallium/winsys \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS)
 
@@ -26,6 +27,7 @@ GALLIUM_DRIVER_CXXFLAGS = \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/src/gallium/winsys \
        $(DEFINES) \
        $(VISIBILITY_CXXFLAGS)
 

diff --git a/src/gallium/drivers/r300/compiler/r300_fragprog.c b/src/gallium/drivers/r300/compiler/r300_fragprog.c
index deba9ca834d01c5a41be5628f9c1c7a948ed0308..3c6e20561c4e5094ffbdf70e71a6646857d65f93 100644 (file)
--- a/src/gallium/drivers/r300/compiler/r300_fragprog.c
+++ b/src/gallium/drivers/r300/compiler/r300_fragprog.c
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include "../r300_reg.h"
+#include "r300_reg.h"
 
 static void presub_string(char out[10], unsigned int inst)
 {

diff --git a/src/gallium/drivers/r300/compiler/r300_fragprog_emit.c b/src/gallium/drivers/r300/compiler/r300_fragprog_emit.c
index 841d46f720388031c26faac97d26324d58707bb5..b539c5dcc82e35506cdee4e6792628c9f164cef2 100644 (file)
--- a/src/gallium/drivers/r300/compiler/r300_fragprog_emit.c
+++ b/src/gallium/drivers/r300/compiler/r300_fragprog_emit.c
@@ -38,7 +38,7 @@
 
 #include "r300_fragprog.h"
 
-#include "../r300_reg.h"
+#include "r300_reg.h"
 
 #include "radeon_program_pair.h"
 #include "r300_fragprog_swizzle.h"

diff --git a/src/gallium/drivers/r300/compiler/r300_fragprog_swizzle.c b/src/gallium/drivers/r300/compiler/r300_fragprog_swizzle.c
index b7bca8c0cfa7f9afbda507a1021c17c242635c23..075eac50f7d4094633a62a58f11873c811739557 100644 (file)
--- a/src/gallium/drivers/r300/compiler/r300_fragprog_swizzle.c
+++ b/src/gallium/drivers/r300/compiler/r300_fragprog_swizzle.c
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 
-#include "../r300_reg.h"
+#include "r300_reg.h"
 #include "radeon_compiler.h"
 
 #define MAKE_SWZ3(x, y, z) (RC_MAKE_SWIZZLE(RC_SWIZZLE_##x, RC_SWIZZLE_##y, RC_SWIZZLE_##z, RC_SWIZZLE_ZERO))

diff --git a/src/gallium/drivers/r300/compiler/r3xx_vertprog.c b/src/gallium/drivers/r300/compiler/r3xx_vertprog.c
index 524c4fdb657a63724372d3e122814eaea7d539c8..fd4f6f4045e25e5ac26bfcd37a6a64f145170f45 100644 (file)
--- a/src/gallium/drivers/r300/compiler/r3xx_vertprog.c
+++ b/src/gallium/drivers/r300/compiler/r3xx_vertprog.c
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 
-#include "../r300_reg.h"
+#include "r300_reg.h"
 
 #include "radeon_compiler_util.h"
 #include "radeon_dataflow.h"

diff --git a/src/gallium/drivers/r300/compiler/r3xx_vertprog_dump.c b/src/gallium/drivers/r300/compiler/r3xx_vertprog_dump.c
index a41559c8fde0142eff4fefaa5faaaf17845a62f6..3cffe4458e8ba46ce1aa7ea5c315776667bcac85 100644 (file)
--- a/src/gallium/drivers/r300/compiler/r3xx_vertprog_dump.c
+++ b/src/gallium/drivers/r300/compiler/r3xx_vertprog_dump.c
@@ -22,7 +22,7 @@
 
 #include "radeon_compiler.h"
 #include "radeon_code.h"
-#include "../r300_reg.h"
+#include "r300_reg.h"
 
 #include <stdio.h>
 

diff --git a/src/gallium/drivers/r300/compiler/r500_fragprog.c b/src/gallium/drivers/r300/compiler/r500_fragprog.c
index 499aa92423bb22ae32127a3ebacd7386d1747428..88aad8a054f11a78b416bc7fa1b95bd4037cf76c 100644 (file)
--- a/src/gallium/drivers/r300/compiler/r500_fragprog.c
+++ b/src/gallium/drivers/r300/compiler/r500_fragprog.c
@@ -32,7 +32,7 @@
 #include "radeon_compiler_util.h"
 #include "radeon_list.h"
 #include "radeon_variable.h"
-#include "../r300_reg.h"
+#include "r300_reg.h"
 
 /**
  * Rewrite IF instructions to use the ALU result special register.

diff --git a/src/gallium/drivers/r300/compiler/r500_fragprog_emit.c b/src/gallium/drivers/r300/compiler/r500_fragprog_emit.c
index f6b6c0f9c0605d4bc8cd9d501dc1aedb4d89f78c..a50b86798b6fb6c126ce6c9c8e0f439aa41ea72c 100644 (file)
--- a/src/gallium/drivers/r300/compiler/r500_fragprog_emit.c
+++ b/src/gallium/drivers/r300/compiler/r500_fragprog_emit.c
@@ -41,7 +41,7 @@
 
 #include "r500_fragprog.h"
 
-#include "../r300_reg.h"
+#include "r300_reg.h"
 
 #include "radeon_program_pair.h"
 

diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index c1f5e3cee1fb836e36145ef3209aebd3712c99ee..7a83611f993a34fbbc8b18fb2bf16b2da04ebf74 100644 (file)
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -22,7 +22,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "r300_chipset.h"
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 
 #include "util/u_debug.h"
 #include "util/u_memory.h"

diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 8736cc734928a925ed741fed1becff90463e4346..92a35d51448be4d8830ebaa5cb2e7239a6971175 100644 (file)
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -36,7 +36,7 @@
 #include "r300_defines.h"
 #include "r300_screen.h"
 #include "compiler/radeon_regalloc.h"
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 
 struct u_upload_mgr;
 struct r300_context;

diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index e129cee57c7423d3cf5634cd2fba7fbe5571362f..f0dd3c62bae1949d4947cafefe916436799c2d4c 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -25,7 +25,7 @@
 #define R300_SCREEN_H
 
 #include "r300_chipset.h"
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 #include "pipe/p_screen.h"
 #include "util/u_slab.h"
 #include "os/os_thread.h"

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index 30e098e1770562c0b7b09ac3801b1fb963cbec34..ff84cd0f5f490e35f9a9300dd5be45c172d226d8 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -20,8 +20,7 @@ libr600_la_SOURCES = \
 if NEED_RADEON_LLVM
 
 AM_CFLAGS += \
-       $(LLVM_CFLAGS) \
-       -I$(top_srcdir)/src/gallium/drivers/radeon/
+       $(LLVM_CFLAGS)
 
 libr600_la_SOURCES += \
        $(LLVM_C_SOURCES)

diff --git a/src/gallium/drivers/r600/r600_llvm.c b/src/gallium/drivers/r600/r600_llvm.c
index d1e3255be857873997a35ab4afe692f9e5d4c107..766141968a0422fcd642754b6106cd41abdd7fa5 100644 (file)
--- a/src/gallium/drivers/r600/r600_llvm.c
+++ b/src/gallium/drivers/r600/r600_llvm.c
@@ -13,8 +13,8 @@
 #include "r600_opcodes.h"
 #include "r600_shader.h"
 #include "r600_pipe.h"
-#include "radeon_llvm.h"
-#include "radeon_llvm_emit.h"
+#include "radeon/radeon_llvm.h"
+#include "radeon/radeon_llvm_emit.h"
 
 #include <stdio.h>
 

diff --git a/src/gallium/drivers/r600/r600_llvm.h b/src/gallium/drivers/r600/r600_llvm.h
index e036bfffac22743dff37a0b7c1fcbc23c564e51b..3840a5a2933193b38f32f153cbe9bb7988fa1742 100644 (file)
--- a/src/gallium/drivers/r600/r600_llvm.h
+++ b/src/gallium/drivers/r600/r600_llvm.h
@@ -4,7 +4,7 @@
 
 #if defined R600_USE_LLVM || defined HAVE_OPENCL
 
-#include "radeon_llvm.h"
+#include "radeon/radeon_llvm.h"
 #include <llvm-c/Core.h>
 
 struct r600_bytecode;

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index e277269cccb56c0d9965cbef9f27000912aa73eb..8907d41a37725b1472290a4d9742545bddfb530b 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -26,8 +26,8 @@
 #ifndef R600_PIPE_H
 #define R600_PIPE_H
 
-#include "../radeon/r600_pipe_common.h"
-#include "../radeon/r600_cs.h"
+#include "radeon/r600_pipe_common.h"
+#include "radeon/r600_cs.h"
 
 #include "r600_llvm.h"
 #include "r600_public.h"

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index ed16e1a7b0c8c3febe5bf64c56eaa6033518af7b..cac6faac951bd4c5d29e372af2b58069c38c850e 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 
 #include "util/u_blitter.h"
 #include "util/u_double_list.h"

diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c
index d77217ca85603c742110b36ca82a97eb4c35267a..9d3b2bff12afaa4bcf122cf1c3b9623409c2aa3a 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_uvd.c
+++ b/src/gallium/drivers/radeon/radeon_uvd.c
@@ -45,7 +45,7 @@
 #include "vl/vl_defines.h"
 #include "vl/vl_mpeg12_decoder.h"
 
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
 #include "radeon_uvd.h"

diff --git a/src/gallium/drivers/radeon/radeon_uvd.h b/src/gallium/drivers/radeon/radeon_uvd.h
index 8cf70fd57ef327c918d20d6b3588bb0a7410ed31..462b101b3ab244e51076351122ea6a90ff0e33ef 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_uvd.h
+++ b/src/gallium/drivers/radeon/radeon_uvd.h
@@ -34,7 +34,7 @@
 #ifndef RADEON_UVD_H
 #define RADEON_UVD_H
 
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 /* UVD uses PM4 packet type 0 and 2 */

diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
index 9174c973ffc842b96c7a5d7669d0af15aeda33a1..b7b88a3fdf00a7612d852c041fa18ff5248323cd 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vce.c
+++ b/src/gallium/drivers/radeon/radeon_vce.c
@@ -40,7 +40,7 @@
 
 #include "vl/vl_video_buffer.h"
 
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
 #include "radeon_vce.h"

diff --git a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
index ecb4b0d3c831b97e2e8bb6efb423aae97fc9d4f1..6b5da47eec8928967002ef59f343bc19b6aa6d93 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
+++ b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
@@ -40,7 +40,7 @@
 
 #include "vl/vl_video_buffer.h"
 
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 #include "radeon_video.h"
 #include "radeon_vce.h"
 

diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeon/radeon_video.c
index 2e683c41b0a075abea491dded1c01a186c5b4c88..e935f67a8b79b0a0a3f3b86170092f4647ae4a96 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_video.c
+++ b/src/gallium/drivers/radeon/radeon_video.c
@@ -39,7 +39,7 @@
 #include "vl/vl_defines.h"
 #include "vl/vl_video_buffer.h"
 
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
 #include "radeon_vce.h"

diff --git a/src/gallium/drivers/radeon/radeon_video.h b/src/gallium/drivers/radeon/radeon_video.h
index 42de5a9d51bef8c2087316e79037e73e4657aceb..01936389f549b1c7db78d417489fb52580d809dd 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_video.h
+++ b/src/gallium/drivers/radeon/radeon_video.h
@@ -34,7 +34,7 @@
 #ifndef RADEON_VIDEO_H
 #define RADEON_VIDEO_H
 
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 #define RVID_ERR(fmt, args...) \

diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 926b2032c8a1bc37060c973d180937449f82a377..aa79c5e01efc6e09c514ea71812186faf0a06d10 100644 (file)
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -24,7 +24,6 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers/radeon \
        $(GALLIUM_DRIVER_CFLAGS) \
        $(RADEON_CFLAGS) \
        $(LLVM_CFLAGS)

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 31de4be195ac26fb1b42c224ff08e475930c3084..fc842d437194f392acf750e6f617862f46ce439b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -24,12 +24,12 @@
 
 #include "util/u_memory.h"
 
-#include "../radeon/r600_cs.h"
+#include "radeon/r600_cs.h"
 #include "si_pipe.h"
 #include "si_shader.h"
 #include "sid.h"
 
-#include "radeon_llvm_util.h"
+#include "radeon/radeon_llvm_util.h"
 
 #define MAX_GLOBAL_BUFFERS 20
 #if HAVE_LLVM < 0x0305

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 0e95f485e52a3a33ddf210535d33891bbbf29fef..792d2c3a9de011f12017f4535048db5d9aee1134 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -23,7 +23,7 @@
  * Authors:
  *      Marek Olšák <marek.olsak@amd.com>
  */
-#include "../radeon/r600_cs.h"
+#include "radeon/r600_cs.h"
 #include "si_pipe.h"
 #include "si_shader.h"
 #include "sid.h"

diff --git a/src/gallium/drivers/radeonsi/si_dma.c b/src/gallium/drivers/radeonsi/si_dma.c
index a69f533c743873c07e7095c6a7f77108539e1a77..4a87f791035b36f6d7167776cd7b011948f82a80 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_dma.c
+++ b/src/gallium/drivers/radeonsi/si_dma.c
@@ -26,7 +26,7 @@
 
 #include "sid.h"
 #include "si_pipe.h"
-#include "../radeon/r600_cs.h"
+#include "radeon/r600_cs.h"
 
 #include "util/u_format.h"
 

diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c
index 705b226d4ddee228a40508fcb2107d1204adda8b..61ebad501795f5d3bfaf60a4d94ddaf69735e247 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pm4.c
+++ b/src/gallium/drivers/radeonsi/si_pm4.c
@@ -24,7 +24,7 @@
  *      Christian König <christian.koenig@amd.com>
  */
 
-#include "../radeon/r600_cs.h"
+#include "radeon/r600_cs.h"
 #include "util/u_memory.h"
 #include "si_pipe.h"
 #include "sid.h"

diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h
index 0702bd46faa5412c603b4fe68cc6447b8923288e..c7e032a5f7c7c8d9e10183acc19064d349b5269f 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pm4.h
+++ b/src/gallium/drivers/radeonsi/si_pm4.h
@@ -27,7 +27,7 @@
 #ifndef SI_PM4_H
 #define SI_PM4_H
 
-#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "radeon/drm/radeon_winsys.h"
 
 #define SI_PM4_MAX_DW          256
 #define SI_PM4_MAX_BO          32

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 08ba8b0ab0f746bf6188bb55c9fb5c9892a9a206..0a5ed960a86937fff4e82a0d20baa466b300292b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -32,8 +32,8 @@
 #include "gallivm/lp_bld_logic.h"
 #include "gallivm/lp_bld_arit.h"
 #include "gallivm/lp_bld_flow.h"
-#include "radeon_llvm.h"
-#include "radeon_llvm_emit.h"
+#include "radeon/radeon_llvm.h"
+#include "radeon/radeon_llvm_emit.h"
 #include "util/u_memory.h"
 #include "tgsi/tgsi_parse.h"
 #include "tgsi/tgsi_util.h"

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 6fcb14b6e945d16075939b71c3287863e596e613..84fcdad8839721bca0926e9313ff1dcfa8d6bc83 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -27,7 +27,7 @@
 #include "si_pipe.h"
 #include "si_shader.h"
 #include "sid.h"
-#include "../radeon/r600_cs.h"
+#include "radeon/r600_cs.h"
 
 #include "tgsi/tgsi_parse.h"
 #include "tgsi/tgsi_scan.h"

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index 7362ad129c985a69f007f5043939560dd75f6250..99f5b1aa29f6b4fa29c5e10b5ce582799f0cefbe 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -28,7 +28,7 @@
 #define SI_STATE_H
 
 #include "si_pm4.h"
-#include "../radeon/r600_pipe_common.h"
+#include "radeon/r600_pipe_common.h"
 
 struct si_screen;
 

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 0f700a8c9ebac57d7cbf65dabc19cbe31536da0c..b0fcb071e2e6ab08ab42a25c2d3a0dbace64b033 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -26,7 +26,7 @@
 
 #include "si_pipe.h"
 #include "si_shader.h"
-#include "../radeon/r600_cs.h"
+#include "radeon/r600_cs.h"
 #include "sid.h"
 
 #include "util/u_format.h"