... and symlink for each target.
Make automake's subdir-objects work for r300.
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
src/gallium/targets/r300/common/drm_target.c | 54 ++++++++++++++++++++++++++++
src/gallium/targets/r300/dri/Makefile.am | 2 +-
src/gallium/targets/r300/dri/drm_target.c | 1 +
src/gallium/targets/r300/drm_target.c | 54 ----------------------------
src/gallium/targets/r300/vdpau/Makefile.am | 2 +-
src/gallium/targets/r300/vdpau/drm_target.c | 1 +
src/gallium/targets/r300/xvmc/Makefile.am | 2 +-
src/gallium/targets/r300/xvmc/drm_target.c | 1 +
8 files changed, 60 insertions(+), 57 deletions(-)
create mode 100644 src/gallium/targets/r300/common/drm_target.c
create mode 120000 src/gallium/targets/r300/dri/drm_target.c
delete mode 100644 src/gallium/targets/r300/drm_target.c
create mode 120000 src/gallium/targets/r300/vdpau/drm_target.c
create mode 120000 src/gallium/targets/r300/xvmc/drm_target.c
diff --git a/src/gallium/targets/r300/common/drm_target.c
b/src/gallium/targets/r300/common/drm_target.c
new file mode 100644
index 0000000..2c10bbd
--- /dev/null
+++ b/src/gallium/targets/r300/common/drm_target.c
@@ -0,0 +1,54 @@
+/**************************************************************************
+ *
+ * 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 "radeon/drm/radeon_winsys.h"
+#include "r300/r300_public.h"
+
+static struct pipe_screen *
+create_screen(int fd)
+{
+ struct radeon_winsys *sws;
+
+ sws = radeon_drm_winsys_create(fd);
+ if (!sws)
+ return NULL;
+
+ if (!sws->screen) {
+ sws->screen = r300_screen_create(sws);
+ if (!sws->screen)
+ return NULL;
+
+ sws->screen = debug_screen_wrap(sws->screen);
+ }
+
+ return sws->screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL)
diff --git a/src/gallium/targets/r300/dri/Makefile.am
b/src/gallium/targets/r300/dri/Makefile.am
index 4b41c30..3f659c9 100644
--- a/src/gallium/targets/r300/dri/Makefile.am
+++ b/src/gallium/targets/r300/dri/Makefile.am
@@ -42,7 +42,7 @@ dri_LTLIBRARIES = r300_dri.la
nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp
r300_dri_la_SOURCES = \
- ../drm_target.c
+ drm_target.c
r300_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
diff --git a/src/gallium/targets/r300/dri/drm_target.c
b/src/gallium/targets/r300/dri/drm_target.c
new file mode 120000
index 0000000..6955421
--- /dev/null
+++ b/src/gallium/targets/r300/dri/drm_target.c
@@ -0,0 +1 @@
+../common/drm_target.c
\ No newline at end of file
diff --git a/src/gallium/targets/r300/drm_target.c
b/src/gallium/targets/r300/drm_target.c
deleted file mode 100644
index 2c10bbd..0000000
--- a/src/gallium/targets/r300/drm_target.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/**************************************************************************
- *
- * 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 "radeon/drm/radeon_winsys.h"
-#include "r300/r300_public.h"
-
-static struct pipe_screen *
-create_screen(int fd)
-{
- struct radeon_winsys *sws;
-
- sws = radeon_drm_winsys_create(fd);
- if (!sws)
- return NULL;
-
- if (!sws->screen) {
- sws->screen = r300_screen_create(sws);
- if (!sws->screen)
- return NULL;
-
- sws->screen = debug_screen_wrap(sws->screen);
- }
-
- return sws->screen;
-}
-
-DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL)
diff --git a/src/gallium/targets/r300/vdpau/Makefile.am
b/src/gallium/targets/r300/vdpau/Makefile.am
index f7a2d6f..9b0039b 100644
--- a/src/gallium/targets/r300/vdpau/Makefile.am
+++ b/src/gallium/targets/r300/vdpau/Makefile.am
@@ -38,7 +38,7 @@ EXPORTS =
'^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$'
nodist_EXTRA_libvdpau_r300_la_SOURCES = dummy.cpp
libvdpau_r300_la_SOURCES = \
- ../drm_target.c \
+ drm_target.c \
vl_winsys_dri.c
libvdpau_r300_la_LDFLAGS = \
diff --git a/src/gallium/targets/r300/vdpau/drm_target.c
b/src/gallium/targets/r300/vdpau/drm_target.c
new file mode 120000
index 0000000..6955421
--- /dev/null
+++ b/src/gallium/targets/r300/vdpau/drm_target.c
@@ -0,0 +1 @@
+../common/drm_target.c
\ No newline at end of file
diff --git a/src/gallium/targets/r300/xvmc/Makefile.am
b/src/gallium/targets/r300/xvmc/Makefile.am
index 93aac0b..f52f691 100644
--- a/src/gallium/targets/r300/xvmc/Makefile.am
+++ b/src/gallium/targets/r300/xvmc/Makefile.am
@@ -36,7 +36,7 @@ xvmc_LTLIBRARIES = libXvMCr300.la
nodist_EXTRA_libXvMCr300_la_SOURCES = dummy.cpp
libXvMCr300_la_SOURCES = \
- ../drm_target.c \
+ drm_target.c \
vl_winsys_dri.c
libXvMCr300_la_LDFLAGS = \
diff --git a/src/gallium/targets/r300/xvmc/drm_target.c
b/src/gallium/targets/r300/xvmc/drm_target.c
new file mode 120000
index 0000000..6955421
--- /dev/null
+++ b/src/gallium/targets/r300/xvmc/drm_target.c
@@ -0,0 +1 @@
+../common/drm_target.c
\ No newline at end of file
--
1.8.4.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
