Mesa (master): build/r300: group build target in common subdir
Christian König
deathsimple at kemper.freedesktop.org
Wed Sep 25 17:41:52 UTC 2013
Module: Mesa
Branch: master
Commit: 533e9a04b4de9f9a10b6ccb0e4d4e3eb66cdd8e7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=533e9a04b4de9f9a10b6ccb0e4d4e3eb66cdd8e7
Author: Christian König <christian.koenig at amd.com>
Date: Wed Sep 25 11:49:49 2013 +0200
build/r300: group build target 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-r300/target.c | 25 ---------
.../targets/{dri-r300 => r300/dri}/Makefile.am | 2 +-
src/gallium/targets/r300/drm_target.c | 52 ++++++++++++++++++++
.../targets/{vdpau-r300 => r300/vdpau}/Makefile.am | 2 +-
.../targets/{xvmc-r300 => r300/xvmc}/Makefile.am | 2 +-
src/gallium/targets/vdpau-r300/target.c | 24 ---------
src/gallium/targets/xvmc-r300/target.c | 24 ---------
9 files changed, 62 insertions(+), 83 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4c99603..b1cb89e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1767,7 +1767,7 @@ if test "x$with_gallium_drivers" != x; then
PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
gallium_require_llvm "Gallium R300"
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
- gallium_check_st "radeon/drm" "dri-r300" "" "" "xvmc-r300" "vdpau-r300"
+ gallium_check_st "radeon/drm" "r300/dri" "" "" "r300/xvmc" "r300/vdpau"
;;
xr600)
HAVE_GALLIUM_R600=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-r300/Makefile
src/gallium/targets/dri-r600/Makefile
src/gallium/targets/dri-radeonsi/Makefile
src/gallium/targets/dri-swrast/Makefile
@@ -2043,9 +2042,11 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/osmesa/Makefile
src/gallium/targets/osmesa/osmesa.pc
src/gallium/targets/pipe-loader/Makefile
+ src/gallium/targets/r300/dri/Makefile
+ src/gallium/targets/r300/vdpau/Makefile
+ src/gallium/targets/r300/xvmc/Makefile
src/gallium/targets/libgl-xlib/Makefile
src/gallium/targets/vdpau-nouveau/Makefile
- src/gallium/targets/vdpau-r300/Makefile
src/gallium/targets/vdpau-r600/Makefile
src/gallium/targets/vdpau-radeonsi/Makefile
src/gallium/targets/vdpau-softpipe/Makefile
@@ -2056,7 +2057,6 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/xorg-r600/Makefile
src/gallium/targets/xorg-radeonsi/Makefile
src/gallium/targets/xvmc-nouveau/Makefile
- src/gallium/targets/xvmc-r300/Makefile
src/gallium/targets/xvmc-r600/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 6bffc01..997ee8e 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -72,15 +72,15 @@ endif
if HAVE_GALLIUM_R300
if HAVE_DRI
-SUBDIRS += dri-r300
+SUBDIRS += r300/dri
endif
if HAVE_ST_XVMC
-SUBDIRS += xvmc-r300
+SUBDIRS += r300/xvmc
endif
if HAVE_ST_VDPAU
-SUBDIRS += vdpau-r300
+SUBDIRS += r300/vdpau
endif
endif
diff --git a/src/gallium/targets/dri-r300/target.c b/src/gallium/targets/dri-r300/target.c
deleted file mode 100644
index 07b0705..0000000
--- a/src/gallium/targets/dri-r300/target.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
-#include "radeon/drm/radeon_drm_public.h"
-#include "r300/r300_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 = r300_screen_create(sws);
- if (!screen)
- return NULL;
-
- screen = debug_screen_wrap(screen);
-
- return screen;
-}
-
-DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL)
diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/r300/dri/Makefile.am
similarity index 99%
rename from src/gallium/targets/dri-r300/Makefile.am
rename to src/gallium/targets/r300/dri/Makefile.am
index 8c0215d..8909840 100644
--- a/src/gallium/targets/dri-r300/Makefile.am
+++ b/src/gallium/targets/r300/dri/Makefile.am
@@ -41,7 +41,7 @@ dri_LTLIBRARIES = r300_dri.la
nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp
r300_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/r300/drm_target.c b/src/gallium/targets/r300/drm_target.c
new file mode 100644
index 0000000..111abd4
--- /dev/null
+++ b/src/gallium/targets/r300/drm_target.c
@@ -0,0 +1,52 @@
+/**************************************************************************
+ *
+ * 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 "target-helpers/inline_debug_helper.h"
+#include "state_tracker/drm_driver.h"
+#include "radeon/drm/radeon_drm_public.h"
+#include "r300/r300_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 = r300_screen_create(sws);
+ if (!screen)
+ return NULL;
+
+ screen = debug_screen_wrap(screen);
+
+ return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL)
diff --git a/src/gallium/targets/vdpau-r300/Makefile.am b/src/gallium/targets/r300/vdpau/Makefile.am
similarity index 99%
rename from src/gallium/targets/vdpau-r300/Makefile.am
rename to src/gallium/targets/r300/vdpau/Makefile.am
index 350f6f8..c928955 100644
--- a/src/gallium/targets/vdpau-r300/Makefile.am
+++ b/src/gallium/targets/r300/vdpau/Makefile.am
@@ -35,7 +35,7 @@ vdpau_LTLIBRARIES = libvdpau_r300.la
nodist_EXTRA_libvdpau_r300_la_SOURCES = dummy.cpp
libvdpau_r300_la_SOURCES = \
- target.c \
+ ../drm_target.c \
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
libvdpau_r300_la_LDFLAGS = \
diff --git a/src/gallium/targets/xvmc-r300/Makefile.am b/src/gallium/targets/r300/xvmc/Makefile.am
similarity index 99%
rename from src/gallium/targets/xvmc-r300/Makefile.am
rename to src/gallium/targets/r300/xvmc/Makefile.am
index 4346b68..7171b4d 100644
--- a/src/gallium/targets/xvmc-r300/Makefile.am
+++ b/src/gallium/targets/r300/xvmc/Makefile.am
@@ -35,7 +35,7 @@ xvmc_LTLIBRARIES = libXvMCr300.la
nodist_EXTRA_libXvMCr300_la_SOURCES = dummy.cpp
libXvMCr300_la_SOURCES = \
- target.c \
+ ../drm_target.c \
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
libXvMCr300_la_LDFLAGS = \
diff --git a/src/gallium/targets/vdpau-r300/target.c b/src/gallium/targets/vdpau-r300/target.c
deleted file mode 100644
index 2fd7c2f..0000000
--- a/src/gallium/targets/vdpau-r300/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 "r300/r300_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 = r300_screen_create(radeon);
- if (!screen)
- return NULL;
-
- screen = debug_screen_wrap(screen);
-
- return screen;
-}
-
-DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL)
diff --git a/src/gallium/targets/xvmc-r300/target.c b/src/gallium/targets/xvmc-r300/target.c
deleted file mode 100644
index 2fd7c2f..0000000
--- a/src/gallium/targets/xvmc-r300/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 "r300/r300_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 = r300_screen_create(radeon);
- if (!screen)
- return NULL;
-
- screen = debug_screen_wrap(screen);
-
- return screen;
-}
-
-DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL)
More information about the mesa-commit
mailing list