From 9df2c4956b6fc4fff1497923d42011c16e777322 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 12 Jun 2014 15:41:29 +0100 Subject: [PATCH] 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 Cc: Ilia Mirkin Signed-off-by: Emil Velikov Tested-by: Thomas Helland --- configure.ac | 5 +- src/gallium/Automake.inc | 3 +- src/gallium/auxiliary/vl/vl_winsys.h | 2 + src/gallium/auxiliary/vl/vl_winsys_dri.c | 24 +++- src/gallium/targets/Makefile.am | 8 +- 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 | 2 + src/gallium/targets/r600/xvmc/Makefile.am | 2 + src/gallium/targets/radeonsi/omx/Makefile.am | 2 + .../targets/radeonsi/vdpau/Makefile.am | 2 + src/gallium/targets/vdpau-nouveau/Makefile.am | 46 -------- src/gallium/targets/vdpau-nouveau/target.c | 18 --- src/gallium/targets/vdpau/Makefile.am | 111 ++++++++++++++++++ src/gallium/targets/vdpau/target.c | 1 + src/gallium/targets/{ => vdpau}/vdpau.sym | 0 src/gallium/targets/xvmc-nouveau/Makefile.am | 2 + 18 files changed, 164 insertions(+), 72 deletions(-) create mode 100644 src/gallium/targets/dri-vdpau.dyn delete mode 100644 src/gallium/targets/vdpau-nouveau/Makefile.am delete mode 100644 src/gallium/targets/vdpau-nouveau/target.c create mode 100644 src/gallium/targets/vdpau/Makefile.am create mode 100644 src/gallium/targets/vdpau/target.c rename src/gallium/targets/{ => vdpau}/vdpau.sym (100%) diff --git a/configure.ac b/configure.ac index 8f861548f80..1750a2b308d 100644 --- a/configure.ac +++ b/configure.ac @@ -1417,6 +1417,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) @@ -1967,7 +1968,7 @@ if test -n "$with_gallium_drivers"; then PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau" - gallium_check_st "nouveau/drm" "dri-nouveau" "" "xvmc-nouveau" "vdpau-nouveau" "omx-nouveau" + gallium_check_st "nouveau/drm" "dri-nouveau" "" "xvmc-nouveau" "vdpau/nouveau" "omx-nouveau" DRICOMMON_NEED_LIBDRM=yes ;; xfreedreno) @@ -2225,7 +2226,7 @@ AC_CONFIG_FILES([Makefile src/gallium/targets/radeonsi/dri/Makefile src/gallium/targets/radeonsi/omx/Makefile src/gallium/targets/radeonsi/vdpau/Makefile - src/gallium/targets/vdpau-nouveau/Makefile + src/gallium/targets/vdpau/Makefile src/gallium/targets/xa/Makefile src/gallium/targets/xa/xatracker.pc src/gallium/targets/xvmc-nouveau/Makefile diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index d55acc9e076..f216fc964d0 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 \ @@ -87,7 +88,7 @@ GALLIUM_DRI_LINKER_FLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym GALLIUM_VDPAU_LINKER_FLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau.sym + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau/vdpau.sym GALLIUM_XVMC_LINKER_FLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc.sym diff --git a/src/gallium/auxiliary/vl/vl_winsys.h b/src/gallium/auxiliary/vl/vl_winsys.h index 642f0108d02..f6b47c964f9 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 5d83e5799da..d1bbcc2ed58 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 // GALLIUM_STATIC_TARGETS +#endif // SPLIT_TARGETS 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 // !GALLIUM_STATIC_TARGETS +#endif // !SPLIT_TARGETS 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 // !GALLIUM_STATIC_TARGETS +#endif // !SPLIT_TARGETS FREE(scrn); } diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index 36d359ce772..529087d1504 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 @@ -113,10 +117,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 00000000000..e5923a23b39 --- /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 40ae06ca859..3b2a1a52e13 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 d2470eaf72c..8d011cc57f5 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 index 8125e2d61c6..1f92c560051 100644 --- a/src/gallium/targets/r600/vdpau/Makefile.am +++ b/src/gallium/targets/r600/vdpau/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/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am index 3e32f86d42c..f2aec1a7122 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 6d6066fe335..3c8cf11bd9c 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 index 9ed40e65b0b..ec1baf646cb 100644 --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am +++ b/src/gallium/targets/radeonsi/vdpau/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/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am deleted file mode 100644 index 36d2f4761ff..00000000000 --- 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 d580b104421..00000000000 --- 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/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.sym b/src/gallium/targets/vdpau/vdpau.sym similarity index 100% rename from src/gallium/targets/vdpau.sym rename to src/gallium/targets/vdpau/vdpau.sym diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am index af7a6fee6c0..e1061cd5eda 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) -- 2.30.2