From dcfbc006b6b07d41338b87c64cdc01c36608087b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 16 Apr 2015 22:50:33 +0200 Subject: [PATCH] winsys/radeon: move radeon_winsys.h to drivers/radeon --- src/gallium/auxiliary/target-helpers/inline_drm_helper.h | 6 +++--- src/gallium/drivers/r300/r300_chipset.c | 2 +- src/gallium/drivers/r300/r300_context.h | 1 - src/gallium/drivers/r300/r300_screen.h | 2 +- src/gallium/drivers/radeon/Makefile.sources | 3 ++- src/gallium/drivers/radeon/r600_pipe_common.h | 2 +- src/gallium/drivers/radeon/radeon_uvd.c | 1 - src/gallium/drivers/radeon/radeon_uvd.h | 2 +- src/gallium/drivers/radeon/radeon_vce.c | 1 - src/gallium/drivers/radeon/radeon_vce_40_2_2.c | 1 - src/gallium/drivers/radeon/radeon_video.c | 1 - src/gallium/drivers/radeon/radeon_video.h | 2 +- .../{winsys/radeon/drm => drivers/radeon}/radeon_winsys.h | 0 src/gallium/drivers/radeonsi/si_pm4.h | 2 +- src/gallium/targets/pipe-loader/pipe_r300.c | 2 +- src/gallium/targets/pipe-loader/pipe_r600.c | 2 +- src/gallium/targets/pipe-loader/pipe_radeonsi.c | 2 +- src/gallium/winsys/radeon/drm/Makefile.sources | 3 +-- src/gallium/winsys/radeon/drm/radeon_drm_winsys.h | 2 +- 19 files changed, 16 insertions(+), 21 deletions(-) rename src/gallium/{winsys/radeon/drm => drivers/radeon}/radeon_winsys.h (100%) diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 542ad438790..d3c331d224d 100644 --- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h @@ -28,19 +28,19 @@ #endif #if GALLIUM_R300 -#include "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #include "radeon/drm/radeon_drm_public.h" #include "r300/r300_public.h" #endif #if GALLIUM_R600 -#include "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #include "radeon/drm/radeon_drm_public.h" #include "r600/r600_public.h" #endif #if GALLIUM_RADEONSI -#include "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #include "radeon/drm/radeon_drm_public.h" #include "radeonsi/si_public.h" #endif diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c index 7a83611f993..c1c7ce3d0bf 100644 --- 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 "radeon/drm/radeon_winsys.h" +#include "radeon/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 4d2b1531ad7..3873c9a31c1 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -36,7 +36,6 @@ #include "r300_defines.h" #include "r300_screen.h" #include "compiler/radeon_regalloc.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 f0dd3c62bae..7bba39bf12b 100644 --- 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 "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #include "pipe/p_screen.h" #include "util/u_slab.h" #include "os/os_thread.h" diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources index 469f6d1692d..c655fe5787b 100644 --- a/src/gallium/drivers/radeon/Makefile.sources +++ b/src/gallium/drivers/radeon/Makefile.sources @@ -15,7 +15,8 @@ C_SOURCES := \ radeon_vce.c \ radeon_vce.h \ radeon_video.c \ - radeon_video.h + radeon_video.h \ + radeon_winsys.h LLVM_C_FILES := \ radeon_elf_util.c \ diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index faa6e0d845a..f1c95037e7f 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -34,7 +34,7 @@ #include -#include "radeon/drm/radeon_winsys.h" +#include "radeon/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 9668d7d8337..4d4b54b3a56 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.c +++ b/src/gallium/drivers/radeon/radeon_uvd.c @@ -45,7 +45,6 @@ #include "vl/vl_defines.h" #include "vl/vl_mpeg12_decoder.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 462b101b3ab..41a6fb4a850 100644 --- 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 "radeon/drm/radeon_winsys.h" +#include "radeon/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 6d34bd3a253..5f710e636c9 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -40,7 +40,6 @@ #include "vl/vl_video_buffer.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 b176aa7bf20..09029575547 100644 --- 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,6 @@ #include "vl/vl_video_buffer.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.c b/src/gallium/drivers/radeon/radeon_video.c index 14207989325..6ec10c1de6c 100644 --- a/src/gallium/drivers/radeon/radeon_video.c +++ b/src/gallium/drivers/radeon/radeon_video.c @@ -39,7 +39,6 @@ #include "vl/vl_defines.h" #include "vl/vl_video_buffer.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 974ea4f47be..6d0ff2834fb 100644 --- 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 "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #include "vl/vl_video_buffer.h" #define RVID_ERR(fmt, args...) \ diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h similarity index 100% rename from src/gallium/winsys/radeon/drm/radeon_winsys.h rename to src/gallium/drivers/radeon/radeon_winsys.h diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h index bfb55629581..d2158827f58 100644 --- 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 "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #define SI_PM4_MAX_DW 256 #define SI_PM4_MAX_BO 32 diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c index abcade46239..368b8c22329 100644 --- a/src/gallium/targets/pipe-loader/pipe_r300.c +++ b/src/gallium/targets/pipe-loader/pipe_r300.c @@ -1,7 +1,7 @@ #include "target-helpers/inline_debug_helper.h" #include "state_tracker/drm_driver.h" #include "radeon/drm/radeon_drm_public.h" -#include "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #include "r300/r300_public.h" static struct pipe_screen * diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c index eb53637d489..65b11c8ba60 100644 --- a/src/gallium/targets/pipe-loader/pipe_r600.c +++ b/src/gallium/targets/pipe-loader/pipe_r600.c @@ -1,7 +1,7 @@ #include "state_tracker/drm_driver.h" #include "target-helpers/inline_debug_helper.h" #include "radeon/drm/radeon_drm_public.h" -#include "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #include "r600/r600_public.h" static struct pipe_screen * diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c index 1dcd781e63a..5457b5b5e32 100644 --- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c +++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c @@ -1,7 +1,7 @@ #include "state_tracker/drm_driver.h" #include "target-helpers/inline_debug_helper.h" #include "radeon/drm/radeon_drm_public.h" -#include "radeon/drm/radeon_winsys.h" +#include "radeon/radeon_winsys.h" #include "radeonsi/si_public.h" static struct pipe_screen * diff --git a/src/gallium/winsys/radeon/drm/Makefile.sources b/src/gallium/winsys/radeon/drm/Makefile.sources index d30969e174f..87a04fa4c9b 100644 --- a/src/gallium/winsys/radeon/drm/Makefile.sources +++ b/src/gallium/winsys/radeon/drm/Makefile.sources @@ -6,8 +6,7 @@ C_SOURCES := \ radeon_drm_cs.h \ radeon_drm_public.h \ radeon_drm_winsys.c \ - radeon_drm_winsys.h \ - radeon_winsys.h + radeon_drm_winsys.h TOOLS_HDR := \ radeon_ctx.h diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h index 5711ffa8e53..ea475c80fb7 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h @@ -30,7 +30,7 @@ #ifndef RADEON_DRM_WINSYS_H #define RADEON_DRM_WINSYS_H -#include "radeon_winsys.h" +#include "gallium/drivers/radeon/radeon_winsys.h" #include "os/os_thread.h" #include -- 2.30.2