summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-09-25 12:28:09 +0200
committerChristian König <christian.koenig@amd.com>2013-09-25 19:41:27 +0200
commitf6e2aa0e12e4ce91dc6f8ac5140d6e1f511ea468 (patch)
tree4f56399d2bc73f95c671c8fbe0cfaf00b2506c23 /src/gallium
parent015853b56872deea493b25248d760ee4eda198e9 (diff)
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@amd.com> Acked-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/targets/Makefile.am6
-rw-r--r--src/gallium/targets/dri-radeonsi/target.c40
-rw-r--r--src/gallium/targets/radeonsi/dri/Makefile.am (renamed from src/gallium/targets/dri-radeonsi/Makefile.am)2
-rw-r--r--src/gallium/targets/radeonsi/drm_target.c67
-rw-r--r--src/gallium/targets/radeonsi/vdpau/Makefile.am (renamed from src/gallium/targets/vdpau-radeonsi/Makefile.am)2
-rw-r--r--src/gallium/targets/radeonsi/xorg/Makefile.am (renamed from src/gallium/targets/xorg-radeonsi/Makefile.am)2
-rw-r--r--src/gallium/targets/radeonsi/xorg/xorg.c (renamed from src/gallium/targets/xorg-radeonsi/xorg.c)2
-rw-r--r--src/gallium/targets/vdpau-radeonsi/target.c24
-rw-r--r--src/gallium/targets/xorg-radeonsi/target.c26
9 files changed, 74 insertions, 97 deletions
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index c5126c03bf6..2498ee17b84 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 1350ba2883d..00000000000
--- 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
index f7d87a69f35..3e927c7c0a1 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 00000000000..7e124cae129
--- /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
index beae309028c..bda88e69997 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
index 5ca1056860f..2eddf02450a 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
index 3db9f315db1..cce79263953 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 ffb66623b2b..00000000000
--- 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 c023c687a93..00000000000
--- 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)