targets/vdpau-nouveau: convert to static/shared pipe-drivers

Create a single library (for the vdpau api) thus reducing
the overall size of mesa. Current commit converts
vdpau-nouveau, with upcomming commits handling the rest.

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

Add SPLIT_TARGETS to guard the other VL targets.

Note: symlink handling is rather ugly and will need an
update to work with BSD and other non-linux platforms.

v2: Split the conversion into per-target basis.

Cc: Maarten Lankhorst <[email protected]>
Cc: Ilia Mirkin <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>

3 files changed, 120 insertions, 0 deletions

diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
new file mode 100644
index 00000000000..23de1c93e6e
--- /dev/null
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -0,0 +1,111 @@
+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,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn \
+	$(GC_SECTIONS) \
+	$(LD_NO_UNDEFINED)
+
+if HAVE_LD_VERSION_SCRIPT
+libvdpau_gallium_la_LDFLAGS += \
+	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau/vdpau.sym
+endif # HAVE_LD_VERSION_SCRIPT
+
+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
+
+MEGADRIVERS =
+STATIC_TARGET_CPPFLAGS = -DGALLIUM_STATIC_TARGETS=1
+STATIC_TARGET_LIB_DEPS = \
+	$(top_builddir)/src/loader/libloader.la
+
+if HAVE_GALLIUM_NOUVEAU
+MEGADRIVERS += nouveau
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU
+STATIC_TARGET_LIB_DEPS += \
+	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
+	$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
+	$(NOUVEAU_LIBS)
+endif
+
+libvdpau_gallium_la_SOURCES += target.c
+libvdpau_gallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS)
+libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)
+
+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 00000000000..fde4a4a7dcf
--- /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 00000000000..f184193c055
--- /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:
+               *;
+};