Mesa (master): build/radeonsi: group all targets in common subdir
Christian König
deathsimple at kemper.freedesktop.org
Wed Sep 25 17:41:52 UTC 2013
Module: Mesa
Branch: master
Commit: f6e2aa0e12e4ce91dc6f8ac5140d6e1f511ea468
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6e2aa0e12e4ce91dc6f8ac5140d6e1f511ea468
Author: Christian König <christian.koenig at amd.com>
Date: Wed Sep 25 12:28:09 2013 +0200
build/radeonsi: group all targets in common subdir
Allows us to share more code between different targets.
Signed-off-by: Christian König <christian.koenig at amd.com>
Acked-by: Marek Olšák <marek.olsak at amd.com>
---
configure.ac | 8 +-
src/gallium/targets/Makefile.am | 6 +-
src/gallium/targets/dri-radeonsi/target.c | 40 ------------
.../{dri-radeonsi => radeonsi/dri}/Makefile.am | 2 +-
src/gallium/targets/radeonsi/drm_target.c | 67 ++++++++++++++++++++
.../{vdpau-radeonsi => radeonsi/vdpau}/Makefile.am | 2 +-
.../{xorg-radeonsi => radeonsi/xorg}/Makefile.am | 2 +-
.../{xorg-radeonsi => radeonsi/xorg}/xorg.c | 2 +-
src/gallium/targets/vdpau-radeonsi/target.c | 24 -------
src/gallium/targets/xorg-radeonsi/target.c | 26 --------
10 files changed, 78 insertions(+), 101 deletions(-)
diff --git a/configure.ac b/configure.ac
index ff8f543..6db0265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1793,7 +1793,7 @@ if test "x$with_gallium_drivers" != x; then
gallium_require_drm_loader
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi"
radeon_llvm_check
- gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" "" "vdpau-radeonsi" ""
+ gallium_check_st "radeon/drm" "radeonsi/dri" "radeonsi/xorg" "" "" "radeonsi/vdpau" ""
;;
xnouveau)
HAVE_GALLIUM_NOUVEAU=yes
@@ -2032,7 +2032,6 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/dri-i915/Makefile
src/gallium/targets/dri-ilo/Makefile
src/gallium/targets/dri-nouveau/Makefile
- src/gallium/targets/dri-radeonsi/Makefile
src/gallium/targets/dri-swrast/Makefile
src/gallium/targets/dri-vmwgfx/Makefile
src/gallium/targets/egl-static/Makefile
@@ -2041,6 +2040,9 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/osmesa/Makefile
src/gallium/targets/osmesa/osmesa.pc
src/gallium/targets/pipe-loader/Makefile
+ src/gallium/targets/radeonsi/dri/Makefile
+ src/gallium/targets/radeonsi/vdpau/Makefile
+ src/gallium/targets/radeonsi/xorg/Makefile
src/gallium/targets/r300/dri/Makefile
src/gallium/targets/r300/vdpau/Makefile
src/gallium/targets/r300/xvmc/Makefile
@@ -2050,13 +2052,11 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/r600/xvmc/Makefile
src/gallium/targets/libgl-xlib/Makefile
src/gallium/targets/vdpau-nouveau/Makefile
- src/gallium/targets/vdpau-radeonsi/Makefile
src/gallium/targets/vdpau-softpipe/Makefile
src/gallium/targets/xa-vmwgfx/Makefile
src/gallium/targets/xa-vmwgfx/xatracker.pc
src/gallium/targets/xorg-i915/Makefile
src/gallium/targets/xorg-nouveau/Makefile
- src/gallium/targets/xorg-radeonsi/Makefile
src/gallium/targets/xvmc-nouveau/Makefile
src/gallium/targets/xvmc-softpipe/Makefile
src/gallium/tests/trivial/Makefile
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index c5126c0..2498ee1 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -104,15 +104,15 @@ endif
if HAVE_GALLIUM_RADEONSI
if HAVE_DRI
-SUBDIRS += dri-radeonsi
+SUBDIRS += radeonsi/dri
endif
if HAVE_ST_XORG
-SUBDIRS += xorg-radeonsi
+SUBDIRS += radeonsi/xorg
endif
if HAVE_ST_VDPAU
-SUBDIRS += vdpau-radeonsi
+SUBDIRS += radeonsi/vdpau
endif
endif
diff --git a/src/gallium/targets/dri-radeonsi/target.c b/src/gallium/targets/dri-radeonsi/target.c
deleted file mode 100644
index 1350ba2..0000000
--- a/src/gallium/targets/dri-radeonsi/target.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "state_tracker/drm_driver.h"
-#include "target-helpers/inline_debug_helper.h"
-#include "radeon/drm/radeon_drm_public.h"
-#include "radeonsi/radeonsi_public.h"
-
-static struct pipe_screen *create_screen(int fd)
-{
- struct radeon_winsys *radeon;
- struct pipe_screen *screen;
-
- radeon = radeon_drm_winsys_create(fd);
- if (!radeon)
- return NULL;
-
- screen = radeonsi_screen_create(radeon);
- if (!screen)
- return NULL;
-
- screen = debug_screen_wrap(screen);
-
- return screen;
-}
-
-static const struct drm_conf_ret throttle_ret = {
- .type = DRM_CONF_INT,
- .val.val_int = 2,
-};
-
-static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
-{
- switch (conf) {
- case DRM_CONF_THROTTLE:
- return &throttle_ret;
- default:
- break;
- }
- return NULL;
-}
-
-DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, drm_configuration)
diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am
similarity index 99%
rename from src/gallium/targets/dri-radeonsi/Makefile.am
rename to src/gallium/targets/radeonsi/dri/Makefile.am
index f7d87a6..3e927c7 100644
--- a/src/gallium/targets/dri-radeonsi/Makefile.am
+++ b/src/gallium/targets/radeonsi/dri/Makefile.am
@@ -41,7 +41,7 @@ dri_LTLIBRARIES = radeonsi_dri.la
nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp
radeonsi_dri_la_SOURCES = \
- target.c \
+ ../drm_target.c \
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
diff --git a/src/gallium/targets/radeonsi/drm_target.c b/src/gallium/targets/radeonsi/drm_target.c
new file mode 100644
index 0000000..7e124ca
--- /dev/null
+++ b/src/gallium/targets/radeonsi/drm_target.c
@@ -0,0 +1,67 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
+#include "radeon/drm/radeon_drm_public.h"
+#include "radeonsi/radeonsi_public.h"
+
+static struct pipe_screen *create_screen(int fd)
+{
+ struct radeon_winsys *radeon;
+ struct pipe_screen *screen;
+
+ radeon = radeon_drm_winsys_create(fd);
+ if (!radeon)
+ return NULL;
+
+ screen = radeonsi_screen_create(radeon);
+ if (!screen)
+ return NULL;
+
+ screen = debug_screen_wrap(screen);
+
+ return screen;
+}
+
+static const struct drm_conf_ret throttle_ret = {
+ .type = DRM_CONF_INT,
+ .val.val_int = 2,
+};
+
+static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
+{
+ switch (conf) {
+ case DRM_CONF_THROTTLE:
+ return &throttle_ret;
+ default:
+ break;
+ }
+ return NULL;
+}
+
+DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, drm_configuration)
diff --git a/src/gallium/targets/vdpau-radeonsi/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
similarity index 99%
rename from src/gallium/targets/vdpau-radeonsi/Makefile.am
rename to src/gallium/targets/radeonsi/vdpau/Makefile.am
index beae309..bda88e6 100644
--- a/src/gallium/targets/vdpau-radeonsi/Makefile.am
+++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
@@ -35,7 +35,7 @@ vdpau_LTLIBRARIES = libvdpau_radeonsi.la
nodist_EXTRA_libvdpau_radeonsi_la_SOURCES = dummy.cpp
libvdpau_radeonsi_la_SOURCES = \
- target.c \
+ ../drm_target.c \
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
libvdpau_radeonsi_la_LDFLAGS = \
diff --git a/src/gallium/targets/xorg-radeonsi/Makefile.am b/src/gallium/targets/radeonsi/xorg/Makefile.am
similarity index 99%
rename from src/gallium/targets/xorg-radeonsi/Makefile.am
rename to src/gallium/targets/radeonsi/xorg/Makefile.am
index 5ca1056..2eddf02 100644
--- a/src/gallium/targets/xorg-radeonsi/Makefile.am
+++ b/src/gallium/targets/radeonsi/xorg/Makefile.am
@@ -39,7 +39,7 @@ xorg_LTLIBRARIES = radeonsi_drv.la
nodist_EXTRA_radeonsi_drv_la_SOURCES = dummy.cpp
radeonsi_drv_la_SOURCES = \
- target.c \
+ ../drm_target.c \
xorg.c
radeonsi_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
diff --git a/src/gallium/targets/xorg-radeonsi/xorg.c b/src/gallium/targets/radeonsi/xorg/xorg.c
similarity index 98%
rename from src/gallium/targets/xorg-radeonsi/xorg.c
rename to src/gallium/targets/radeonsi/xorg/xorg.c
index 3db9f31..cce7926 100644
--- a/src/gallium/targets/xorg-radeonsi/xorg.c
+++ b/src/gallium/targets/radeonsi/xorg/xorg.c
@@ -29,7 +29,7 @@
*
*/
-#include "../../state_trackers/xorg/xorg_winsys.h"
+#include "../../../state_trackers/xorg/xorg_winsys.h"
static void radeonsi_xorg_identify(int flags);
static Bool radeonsi_xorg_pci_probe(DriverPtr driver,
diff --git a/src/gallium/targets/vdpau-radeonsi/target.c b/src/gallium/targets/vdpau-radeonsi/target.c
deleted file mode 100644
index ffb6662..0000000
--- a/src/gallium/targets/vdpau-radeonsi/target.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "state_tracker/drm_driver.h"
-#include "target-helpers/inline_debug_helper.h"
-#include "radeon/drm/radeon_drm_public.h"
-#include "radeonsi/radeonsi_public.h"
-
-static struct pipe_screen *create_screen(int fd)
-{
- struct radeon_winsys *radeon;
- struct pipe_screen *screen;
-
- radeon = radeon_drm_winsys_create(fd);
- if (!radeon)
- return NULL;
-
- screen = radeonsi_screen_create(radeon);
- if (!screen)
- return NULL;
-
- screen = debug_screen_wrap(screen);
-
- return screen;
-}
-
-DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, NULL)
diff --git a/src/gallium/targets/xorg-radeonsi/target.c b/src/gallium/targets/xorg-radeonsi/target.c
deleted file mode 100644
index c023c68..0000000
--- a/src/gallium/targets/xorg-radeonsi/target.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
-#include "radeon/drm/radeon_drm_public.h"
-#include "radeonsi/radeonsi_public.h"
-
-static struct pipe_screen *
-create_screen(int fd)
-{
- struct radeon_winsys *sws;
- struct pipe_screen *screen;
-
- sws = radeon_drm_winsys_create(fd);
- if (!sws)
- return NULL;
-
- screen = radeonsi_screen_create(sws);
- if (!screen)
- return NULL;
-
- screen = debug_screen_wrap(screen);
-
- return screen;
-}
-
-DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, NULL)
More information about the mesa-commit
mailing list