[Mesa-dev] [PATCH 16/23] targets/vdpau: convert to static and shared pipe-drivers

Emil Velikov emil.l.velikov at gmail.com
Sun May 18 00:07:38 PDT 2014


Create a single library containing the state-tracker etc.
thus have a smaller overall size footprint of mesa.

The driver can be built with the relevant pipe-drivers
statically linked in, or loaded as shared modules.
Currently we default to static link.

Add SPLIT_TARGETS to guard the other VL targets.

Note: symlink handling is rather ugly at the moment due
to versioning of the libvdpau library. Tested only on
linux plarform. BSD and other platforms will likely need
and update.

Cc: Jonathan Gray <jsg at jsg.id.au>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 configure.ac                                    |  5 +-
 install-gallium-links.mk                        |  3 +-
 src/gallium/Automake.inc                        | 19 +----
 src/gallium/auxiliary/vl/vl_winsys.h            |  2 +
 src/gallium/auxiliary/vl/vl_winsys_dri.c        | 24 +++++-
 src/gallium/targets/Makefile.am                 | 16 +---
 src/gallium/targets/dri-vdpau.dyn               |  4 +
 src/gallium/targets/omx-nouveau/Makefile.am     |  2 +
 src/gallium/targets/r600/omx/Makefile.am        |  2 +
 src/gallium/targets/r600/vdpau/Makefile.am      | 47 ------------
 src/gallium/targets/r600/vdpau/drm_target.c     |  1 -
 src/gallium/targets/r600/xvmc/Makefile.am       |  2 +
 src/gallium/targets/radeonsi/omx/Makefile.am    |  2 +
 src/gallium/targets/radeonsi/vdpau/Makefile.am  | 48 ------------
 src/gallium/targets/radeonsi/vdpau/drm_target.c |  1 -
 src/gallium/targets/vdpau-nouveau/Makefile.am   | 46 ------------
 src/gallium/targets/vdpau-nouveau/target.c      | 18 -----
 src/gallium/targets/vdpau.sym                   |  8 --
 src/gallium/targets/vdpau/Makefile.am           | 98 +++++++++++++++++++++++++
 src/gallium/targets/vdpau/target.c              |  1 +
 src/gallium/targets/vdpau/vdpau.sym             |  8 ++
 src/gallium/targets/xvmc-nouveau/Makefile.am    |  2 +
 22 files changed, 154 insertions(+), 205 deletions(-)
 create mode 100644 src/gallium/targets/dri-vdpau.dyn
 delete mode 100644 src/gallium/targets/r600/vdpau/Makefile.am
 delete mode 120000 src/gallium/targets/r600/vdpau/drm_target.c
 delete mode 100644 src/gallium/targets/radeonsi/vdpau/Makefile.am
 delete mode 120000 src/gallium/targets/radeonsi/vdpau/drm_target.c
 delete mode 100644 src/gallium/targets/vdpau-nouveau/Makefile.am
 delete mode 100644 src/gallium/targets/vdpau-nouveau/target.c
 delete mode 100644 src/gallium/targets/vdpau.sym
 create mode 100644 src/gallium/targets/vdpau/Makefile.am
 create mode 100644 src/gallium/targets/vdpau/target.c
 create mode 100644 src/gallium/targets/vdpau/vdpau.sym

diff --git a/configure.ac b/configure.ac
index d802875..cfd79ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1347,6 +1347,7 @@ if test "x$enable_vdpau" = xyes; then
     PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED],
                       [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"])
     GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau"
+    enable_gallium_loader=yes
 fi
 AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes)
 
@@ -2147,14 +2148,12 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/targets/pipe-loader/Makefile
 		src/gallium/targets/radeonsi/dri/Makefile
 		src/gallium/targets/radeonsi/omx/Makefile
-		src/gallium/targets/radeonsi/vdpau/Makefile
 		src/gallium/targets/r300/dri/Makefile
 		src/gallium/targets/r600/dri/Makefile
 		src/gallium/targets/r600/omx/Makefile
-		src/gallium/targets/r600/vdpau/Makefile
 		src/gallium/targets/r600/xvmc/Makefile
 		src/gallium/targets/libgl-xlib/Makefile
-		src/gallium/targets/vdpau-nouveau/Makefile
+		src/gallium/targets/vdpau/Makefile
 		src/gallium/targets/xvmc-nouveau/Makefile
 		src/gallium/tests/trivial/Makefile
 		src/gallium/tests/unit/Makefile
diff --git a/install-gallium-links.mk b/install-gallium-links.mk
index 757b288..f45f1b4 100644
--- a/install-gallium-links.mk
+++ b/install-gallium-links.mk
@@ -5,7 +5,7 @@ if BUILD_SHARED
 if HAVE_COMPAT_SYMLINKS
 all-local : .libs/install-gallium-links
 
-.libs/install-gallium-links : $(dri_LTLIBRARIES) $(vdpau_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES)
+.libs/install-gallium-links : $(dri_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES)
 	$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);	\
 	link_dir=$(top_builddir)/$(LIB_DIR)/gallium;		\
 	if test x$(egl_LTLIBRARIES) != x; then			\
@@ -13,7 +13,6 @@ all-local : .libs/install-gallium-links
 	fi;							\
 	$(MKDIR_P) $$link_dir;					\
 	file_list=$(dri_LTLIBRARIES:%.la=.libs/%.so);		\
-	file_list+=$(vdpau_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \
 	file_list+=$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*);	\
 	file_list+=$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*);	\
 	for f in $$file_list; do 				\
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 557aa91..3bdd7ab 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -41,6 +41,7 @@ GALLIUM_DRI_CFLAGS = \
 
 GALLIUM_VIDEO_CFLAGS = \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/loader \
 	-I$(top_srcdir)/src/gallium/include \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/gallium/drivers \
@@ -59,15 +60,6 @@ GALLIUM_DRI_LINKER_FLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym \
 	$(GC_SECTIONS)
 
-GALLIUM_VDPAU_LINKER_FLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau.sym \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
 GALLIUM_XVMC_LINKER_FLAGS = \
 	-shared \
 	-module \
@@ -100,13 +92,6 @@ GALLIUM_DRI_LIB_DEPS = \
 	$(EXPAT_LIBS) \
 	$(GALLIUM_COMMON_LIB_DEPS)
 
-GALLIUM_VDPAU_LIB_DEPS = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
-	$(VDPAU_LIBS) \
-	$(LIBDRM_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
 GALLIUM_XVMC_LIB_DEPS = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
@@ -234,12 +219,10 @@ endif
 if HAVE_MESA_LLVM
 
 GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS)
-GALLIUM_VDPAU_LINKER_FLAGS += $(LLVM_LDFLAGS)
 GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS)
 GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS)
 
 GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS)
-GALLIUM_VDPAU_LIB_DEPS += $(LLVM_LIBS)
 GALLIUM_XVMC_LIB_DEPS += $(LLVM_LIBS)
 GALLIUM_OMX_LIB_DEPS += $(LLVM_LIBS)
 
diff --git a/src/gallium/auxiliary/vl/vl_winsys.h b/src/gallium/auxiliary/vl/vl_winsys.h
index 642f010..f6b47c9 100644
--- a/src/gallium/auxiliary/vl/vl_winsys.h
+++ b/src/gallium/auxiliary/vl/vl_winsys.h
@@ -38,10 +38,12 @@
 
 struct pipe_screen;
 struct pipe_surface;
+struct pipe_loader_device;
 
 struct vl_screen
 {
    struct pipe_screen *pscreen;
+   struct pipe_loader_device *dev;
 };
 
 struct vl_screen*
diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c
index 5d83e57..6c60756 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_dri.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c
@@ -40,6 +40,7 @@
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
+#include "pipe-loader/pipe_loader.h"
 #include "state_tracker/drm_driver.h"
 
 #include "util/u_memory.h"
@@ -375,10 +376,19 @@ vl_screen_create(Display *display, int screen)
    if (authenticate == NULL || !authenticate->authenticated)
       goto free_authenticate;
 
+#if SPLIT_TARGETS
    scrn->base.pscreen = driver_descriptor.create_screen(fd);
+#else
+#if GALLIUM_STATIC_TARGETS
+   scrn->base.pscreen = dd_create_screen(fd);
+#else
+   if (pipe_loader_drm_probe_fd(&scrn->base.dev, fd, true))
+      scrn->base.pscreen = pipe_loader_create_screen(scrn->base.dev, PIPE_SEARCH_DIR);
+#endif
+#endif
 
    if (!scrn->base.pscreen)
-      goto free_authenticate;
+      goto release_pipe;
 
    scrn->base.pscreen->flush_frontbuffer = vl_dri2_flush_frontbuffer;
    vl_compositor_reset_dirty_area(&scrn->dirty_areas[0]);
@@ -391,6 +401,13 @@ vl_screen_create(Display *display, int screen)
 
    return &scrn->base;
 
+release_pipe:
+#if !SPLIT_TARGETS
+#if !GALLIUM_STATIC_TARGETS
+   if (scrn->base.dev)
+      pipe_loader_release(&scrn->base.dev, 1);
+#endif
+#endif
 free_authenticate:
    free(authenticate);
 free_connect:
@@ -418,5 +435,10 @@ void vl_screen_destroy(struct vl_screen *vscreen)
 
    vl_dri2_destroy_drawable(scrn);
    scrn->base.pscreen->destroy(scrn->base.pscreen);
+#if !SPLIT_TARGETS
+#if !GALLIUM_STATIC_TARGETS
+   pipe_loader_release(&scrn->base.dev, 1);
+#endif
+#endif
    FREE(scrn);
 }
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index 5023dbc..97c0931 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -34,6 +34,10 @@ if HAVE_GALLIUM_GBM
 SUBDIRS += gbm
 endif
 
+if HAVE_ST_VDPAU
+SUBDIRS += vdpau
+endif
+
 if HAVE_ST_XA
 SUBDIRS += xa
 endif
@@ -81,10 +85,6 @@ if HAVE_ST_XVMC
 SUBDIRS += r600/xvmc
 endif
 
-if HAVE_ST_VDPAU
-SUBDIRS += r600/vdpau
-endif
-
 if HAVE_ST_OMX
 SUBDIRS += r600/omx
 endif
@@ -95,10 +95,6 @@ if HAVE_DRI
 SUBDIRS += radeonsi/dri
 endif
 
-if HAVE_ST_VDPAU
-SUBDIRS += radeonsi/vdpau
-endif
-
 if HAVE_ST_OMX
 SUBDIRS += radeonsi/omx
 endif
@@ -113,10 +109,6 @@ if HAVE_ST_XVMC
 SUBDIRS += xvmc-nouveau
 endif
 
-if HAVE_ST_VDPAU
-SUBDIRS += vdpau-nouveau
-endif
-
 if HAVE_ST_OMX
 SUBDIRS += omx-nouveau
 endif
diff --git a/src/gallium/targets/dri-vdpau.dyn b/src/gallium/targets/dri-vdpau.dyn
new file mode 100644
index 0000000..e5923a2
--- /dev/null
+++ b/src/gallium/targets/dri-vdpau.dyn
@@ -0,0 +1,4 @@
+{
+	nouveau_drm_screen_create;
+	radeon_drm_winsys_create;
+};
diff --git a/src/gallium/targets/omx-nouveau/Makefile.am b/src/gallium/targets/omx-nouveau/Makefile.am
index 40ae06c..3b2a1a5 100644
--- a/src/gallium/targets/omx-nouveau/Makefile.am
+++ b/src/gallium/targets/omx-nouveau/Makefile.am
@@ -22,6 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
+AM_CPPFLAGS = \
+	-DSPLIT_TARGETS=1
 AM_CFLAGS = \
 	$(GALLIUM_VIDEO_CFLAGS)
 
diff --git a/src/gallium/targets/r600/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am
index d2470ea..8d011cc 100644
--- a/src/gallium/targets/r600/omx/Makefile.am
+++ b/src/gallium/targets/r600/omx/Makefile.am
@@ -22,6 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
+AM_CPPFLAGS = \
+	-DSPLIT_TARGETS=1
 AM_CFLAGS = \
 	$(GALLIUM_VIDEO_CFLAGS)
 
diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am
deleted file mode 100644
index 8125e2d..0000000
--- a/src/gallium/targets/r600/vdpau/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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, sublicense,
-# 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
-# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS 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 $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_VIDEO_CFLAGS)
-
-vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
-vdpau_LTLIBRARIES = libvdpau_r600.la
-
-nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy.cpp
-libvdpau_r600_la_SOURCES = \
-	drm_target.c \
-	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
-
-libvdpau_r600_la_LDFLAGS = \
-	$(GALLIUM_VDPAU_LINKER_FLAGS) \
-	-Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
-
-libvdpau_r600_la_LIBADD = \
-	$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
-	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-	$(GALLIUM_VDPAU_LIB_DEPS) \
-	$(RADEON_LIBS)
-
-include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/r600/vdpau/drm_target.c b/src/gallium/targets/r600/vdpau/drm_target.c
deleted file mode 120000
index 6955421..0000000
--- a/src/gallium/targets/r600/vdpau/drm_target.c
+++ /dev/null
@@ -1 +0,0 @@
-../common/drm_target.c
\ No newline at end of file
diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
index 3e32f86..f2aec1a 100644
--- a/src/gallium/targets/r600/xvmc/Makefile.am
+++ b/src/gallium/targets/r600/xvmc/Makefile.am
@@ -22,6 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
+AM_CPPFLAGS = \
+	-DSPLIT_TARGETS=1
 AM_CFLAGS = \
 	$(GALLIUM_VIDEO_CFLAGS)
 
diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am
index 6d6066f..3c8cf11 100644
--- a/src/gallium/targets/radeonsi/omx/Makefile.am
+++ b/src/gallium/targets/radeonsi/omx/Makefile.am
@@ -22,6 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
+AM_CPPFLAGS = \
+	-DSPLIT_TARGETS=1
 AM_CFLAGS = \
 	$(GALLIUM_VIDEO_CFLAGS)
 
diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
deleted file mode 100644
index 9ed40e6..0000000
--- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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, sublicense,
-# 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
-# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS 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 $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_VIDEO_CFLAGS)
-
-vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
-vdpau_LTLIBRARIES = libvdpau_radeonsi.la
-
-nodist_EXTRA_libvdpau_radeonsi_la_SOURCES = dummy.cpp
-libvdpau_radeonsi_la_SOURCES = \
-	drm_target.c \
-	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
-
-libvdpau_radeonsi_la_LDFLAGS = \
-	$(GALLIUM_VDPAU_LINKER_FLAGS) \
-	-Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
-
-
-libvdpau_radeonsi_la_LIBADD = \
-	$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
-	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-	$(GALLIUM_VDPAU_LIB_DEPS) \
-	$(RADEON_LIBS)
-
-include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/radeonsi/vdpau/drm_target.c b/src/gallium/targets/radeonsi/vdpau/drm_target.c
deleted file mode 120000
index 6955421..0000000
--- a/src/gallium/targets/radeonsi/vdpau/drm_target.c
+++ /dev/null
@@ -1 +0,0 @@
-../common/drm_target.c
\ No newline at end of file
diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am
deleted file mode 100644
index 36d2f47..0000000
--- a/src/gallium/targets/vdpau-nouveau/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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, sublicense,
-# 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
-# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS 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 $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_VIDEO_CFLAGS)
-
-vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
-vdpau_LTLIBRARIES = libvdpau_nouveau.la
-
-nodist_EXTRA_libvdpau_nouveau_la_SOURCES = dummy.cpp
-libvdpau_nouveau_la_SOURCES = \
-	target.c \
-	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
-
-libvdpau_nouveau_la_LDFLAGS = \
-	$(GALLIUM_VDPAU_LINKER_FLAGS) \
-	-Wl,--dynamic-list=$(srcdir)/../dri-nouveau/nouveau_dri.dyn
-
-libvdpau_nouveau_la_LIBADD = \
-	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
-	$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
-	$(GALLIUM_VDPAU_LIB_DEPS) \
-	$(NOUVEAU_LIBS)
-
-include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/vdpau-nouveau/target.c b/src/gallium/targets/vdpau-nouveau/target.c
deleted file mode 100644
index d580b10..0000000
--- a/src/gallium/targets/vdpau-nouveau/target.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "state_tracker/drm_driver.h"
-#include "target-helpers/inline_debug_helper.h"
-#include "nouveau/drm/nouveau_drm_public.h"
-
-static struct pipe_screen *create_screen(int fd)
-{
-   struct pipe_screen *screen;
-
-   screen = nouveau_drm_screen_create(fd);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-}
-
-DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen, NULL)
diff --git a/src/gallium/targets/vdpau.sym b/src/gallium/targets/vdpau.sym
deleted file mode 100644
index f184193..0000000
--- a/src/gallium/targets/vdpau.sym
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-       global:
-               vdp_imp_device_create_x11;
-               nouveau_drm_screen_create;
-               radeon_drm_winsys_create;
-       local:
-               *;
-};
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
new file mode 100644
index 0000000..63aff1b
--- /dev/null
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -0,0 +1,98 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	$(GALLIUM_VIDEO_CFLAGS)
+
+vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
+vdpau_LTLIBRARIES = libvdpau_gallium.la
+
+nodist_EXTRA_libvdpau_gallium_la_SOURCES = dummy.cpp
+libvdpau_gallium_la_SOURCES = \
+	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+libvdpau_gallium_la_LDFLAGS = \
+	-shared \
+	-module \
+	-no-undefined \
+	-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
+	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau/vdpau.sym \
+	-Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn \
+	$(GC_SECTIONS) \
+	$(LD_NO_UNDEFINED)
+
+libvdpau_gallium_la_LIBADD = \
+	$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(VDPAU_LIBS) \
+	$(LIBDRM_LIBS) \
+	$(GALLIUM_COMMON_LIB_DEPS)
+
+
+if HAVE_GALLIUM_STATIC_TARGETS
+
+libvdpau_gallium_la_SOURCES += target.c
+libvdpau_gallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS)
+libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)
+
+if HAVE_GALLIUM_R300
+libvdpau_gallium_la_LIBADD += \
+	$(top_builddir)/src/gallium/drivers/r300/libr300-helper.la
+endif
+
+else # HAVE_GALLIUM_STATIC_TARGETS
+
+libvdpau_gallium_la_CPPFLAGS = \
+	$(GALLIUM_PIPE_LOADER_DEFINES) \
+	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
+
+# XXX: Use the pipe-loader-client over pipe-loader ?
+libvdpau_gallium_la_LIBADD += \
+	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
+	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
+	$(GALLIUM_PIPE_LOADER_LIBS)
+
+endif # HAVE_GALLIUM_STATIC_TARGETS
+
+if HAVE_MESA_LLVM
+libvdpau_gallium_la_LIBADD += $(LLVM_LIBS)
+libvdpau_gallium_la_LDFLAGS += $(LLVM_LDFLAGS)
+endif
+
+if HAVE_COMPAT_SYMLINKS
+# Add a link to allow setting VDPAU_DRIVER_PATH to /lib/gallium of the build tree.
+all-local: $(vdpau_LTLIBRARIES)
+	$(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium;		\
+	$(MKDIR_P) $${link_dir};					\
+	for i in $(MEGADRIVERS); do					\
+		j=libvdpau_gallium.$(LIB_EXT);				\
+		k=libvdpau_$${i}.$(LIB_EXT);				\
+		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
+		ln -f .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0	\
+		      $${link_dir}/$${l};				\
+		ln -sf $${l}						\
+		       $${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
+		ln -sf $${l}						\
+		       $${link_dir}/$${k}.$(VDPAU_MAJOR);		\
+		ln -sf $${l}						\
+		       $${link_dir}/$${k};				\
+	done
+endif
+
+# hardlink each megadriver instance, but don't actually have
+# libvdpau_gallium.so in the set of final installed files.
+install-data-hook:
+	$(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir);			\
+	for i in $(MEGADRIVERS); do					\
+		j=libvdpau_gallium.$(LIB_EXT);				\
+		k=libvdpau_$${i}.$(LIB_EXT);				\
+		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
+		ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+		      $${dest_dir}/$${l}				\
+		ln -sf $${l}						\
+		       $${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
+		ln -sf $${l}						\
+		       $${link_dir}/$${k}.$(VDPAU_MAJOR);		\
+		ln -sf $${l}						\
+		       $${link_dir}/$${k};				\
+	done;								\
+	$(RM) -f $$dest_dir/libvdpau_gallium.*
diff --git a/src/gallium/targets/vdpau/target.c b/src/gallium/targets/vdpau/target.c
new file mode 100644
index 0000000..fde4a4a
--- /dev/null
+++ b/src/gallium/targets/vdpau/target.c
@@ -0,0 +1 @@
+#include "target-helpers/inline_drm_helper.h"
diff --git a/src/gallium/targets/vdpau/vdpau.sym b/src/gallium/targets/vdpau/vdpau.sym
new file mode 100644
index 0000000..f184193
--- /dev/null
+++ b/src/gallium/targets/vdpau/vdpau.sym
@@ -0,0 +1,8 @@
+{
+       global:
+               vdp_imp_device_create_x11;
+               nouveau_drm_screen_create;
+               radeon_drm_winsys_create;
+       local:
+               *;
+};
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am
index af7a6fe..e1061cd 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -22,6 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
+AM_CPPFLAGS = \
+	-DSPLIT_TARGETS=1
 AM_CFLAGS = \
 	$(GALLIUM_VIDEO_CFLAGS)
 
-- 
1.9.2



More information about the mesa-dev mailing list