Mesa (master): winsys/radeon: move radeon_winsys.h to drivers/radeon
Marek Olšák
mareko at kemper.freedesktop.org
Wed Apr 29 20:05:24 UTC 2015
Module: Mesa
Branch: master
Commit: dcfbc006b6b07d41338b87c64cdc01c36608087b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dcfbc006b6b07d41338b87c64cdc01c36608087b
Author: Marek Olšák <marek.olsak at amd.com>
Date: Thu Apr 16 22:50:33 2015 +0200
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(-)
diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
index 542ad43..d3c331d 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 7a83611..c1c7ce3 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 4d2b153..3873c9a 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 f0dd3c6..7bba39b 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 469f6d1..c655fe5 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 faa6e0d..f1c9503 100644
--- 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 "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 9668d7d..4d4b54b 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 462b101..41a6fb4 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 6d34bd3..5f710e6 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 b176aa7..0902957 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 1420798..6ec10c1 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 974ea4f..6d0ff28 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 bfb5562..d215882 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 abcade4..368b8c2 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 eb53637..65b11c8 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 1dcd781..5457b5b 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 d30969e..87a04fa 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 5711ffa..ea475c8 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 <radeon_drm.h>
More information about the mesa-commit
mailing list