targets/xvmc-nouveau: convert to static/shared pipe-drivers
Similar to vdpau targets, we're going to convert the individual target libraries into a single one. The library can be built with the relevant pipe-drivers statically linked in, or loaded as shared modules. Currently we default to static. Cc: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Tested-by: Thomas Helland <thomashelland90 at gmail.com>
This commit is contained in:
parent
291d70210d
commit
dc01ca44a7
|
@ -1410,6 +1410,7 @@ fi
|
||||||
if test "x$enable_xvmc" = xyes; then
|
if test "x$enable_xvmc" = xyes; then
|
||||||
PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
|
PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
|
||||||
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc"
|
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc"
|
||||||
|
enable_gallium_loader=yes
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes)
|
AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes)
|
||||||
|
|
||||||
|
@ -1968,7 +1969,7 @@ if test -n "$with_gallium_drivers"; then
|
||||||
PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
|
PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
|
||||||
gallium_require_drm_loader
|
gallium_require_drm_loader
|
||||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau"
|
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
|
DRICOMMON_NEED_LIBDRM=yes
|
||||||
;;
|
;;
|
||||||
xfreedreno)
|
xfreedreno)
|
||||||
|
@ -2227,7 +2228,7 @@ AC_CONFIG_FILES([Makefile
|
||||||
src/gallium/targets/vdpau/Makefile
|
src/gallium/targets/vdpau/Makefile
|
||||||
src/gallium/targets/xa/Makefile
|
src/gallium/targets/xa/Makefile
|
||||||
src/gallium/targets/xa/xatracker.pc
|
src/gallium/targets/xa/xatracker.pc
|
||||||
src/gallium/targets/xvmc-nouveau/Makefile
|
src/gallium/targets/xvmc/Makefile
|
||||||
src/gallium/tests/trivial/Makefile
|
src/gallium/tests/trivial/Makefile
|
||||||
src/gallium/tests/unit/Makefile
|
src/gallium/tests/unit/Makefile
|
||||||
src/gallium/winsys/Makefile
|
src/gallium/winsys/Makefile
|
||||||
|
|
|
@ -80,7 +80,7 @@ GALLIUM_DRI_LINKER_FLAGS += \
|
||||||
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym
|
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym
|
||||||
|
|
||||||
GALLIUM_XVMC_LINKER_FLAGS += \
|
GALLIUM_XVMC_LINKER_FLAGS += \
|
||||||
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc.sym
|
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc/xvmc.sym
|
||||||
|
|
||||||
GALLIUM_OMX_LINKER_FLAGS += \
|
GALLIUM_OMX_LINKER_FLAGS += \
|
||||||
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym
|
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym
|
||||||
|
|
|
@ -42,6 +42,10 @@ if HAVE_ST_XA
|
||||||
SUBDIRS += xa
|
SUBDIRS += xa
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if HAVE_ST_XVMC
|
||||||
|
SUBDIRS += xvmc
|
||||||
|
endif
|
||||||
|
|
||||||
if HAVE_CLOVER
|
if HAVE_CLOVER
|
||||||
SUBDIRS += opencl
|
SUBDIRS += opencl
|
||||||
endif
|
endif
|
||||||
|
@ -105,10 +109,6 @@ if HAVE_DRI2
|
||||||
SUBDIRS += dri-nouveau
|
SUBDIRS += dri-nouveau
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HAVE_ST_XVMC
|
|
||||||
SUBDIRS += xvmc-nouveau
|
|
||||||
endif
|
|
||||||
|
|
||||||
if HAVE_ST_OMX
|
if HAVE_ST_OMX
|
||||||
SUBDIRS += omx-nouveau
|
SUBDIRS += omx-nouveau
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,45 +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_CPPFLAGS = \
|
|
||||||
-DSPLIT_TARGETS=1
|
|
||||||
AM_CFLAGS = \
|
|
||||||
$(GALLIUM_VIDEO_CFLAGS)
|
|
||||||
|
|
||||||
xvmcdir = $(XVMC_LIB_INSTALL_DIR)
|
|
||||||
xvmc_LTLIBRARIES = libXvMCnouveau.la
|
|
||||||
|
|
||||||
nodist_EXTRA_libXvMCnouveau_la_SOURCES = dummy.cpp
|
|
||||||
libXvMCnouveau_la_SOURCES = \
|
|
||||||
target.c \
|
|
||||||
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
|
|
||||||
|
|
||||||
libXvMCnouveau_la_LDFLAGS = \
|
|
||||||
$(GALLIUM_XVMC_LINKER_FLAGS)
|
|
||||||
|
|
||||||
libXvMCnouveau_la_LIBADD = \
|
|
||||||
$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
|
|
||||||
$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
|
|
||||||
$(GALLIUM_XVMC_LIB_DEPS) \
|
|
||||||
$(NOUVEAU_LIBS)
|
|
|
@ -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)
|
|
|
@ -0,0 +1,90 @@
|
||||||
|
include $(top_srcdir)/src/gallium/Automake.inc
|
||||||
|
|
||||||
|
AM_CFLAGS = \
|
||||||
|
$(GALLIUM_VIDEO_CFLAGS)
|
||||||
|
|
||||||
|
xvmcdir = $(XVMC_LIB_INSTALL_DIR)
|
||||||
|
xvmc_LTLIBRARIES = libXvMCgallium.la
|
||||||
|
|
||||||
|
nodist_EXTRA_libXvMCgallium_la_SOURCES = dummy.cpp
|
||||||
|
libXvMCgallium_la_SOURCES = \
|
||||||
|
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
|
||||||
|
|
||||||
|
libXvMCgallium_la_LDFLAGS = \
|
||||||
|
-shared \
|
||||||
|
-module \
|
||||||
|
-no-undefined \
|
||||||
|
-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
|
||||||
|
$(GC_SECTIONS) \
|
||||||
|
$(LD_NO_UNDEFINED)
|
||||||
|
|
||||||
|
if HAVE_LD_VERSION_SCRIPT
|
||||||
|
libXvMCgallium_la_LDFLAGS += \
|
||||||
|
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc/xvmc.sym
|
||||||
|
endif # HAVE_LD_VERSION_SCRIPT
|
||||||
|
|
||||||
|
libXvMCgallium_la_LIBADD = \
|
||||||
|
$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
|
||||||
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
|
$(XVMC_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
|
||||||
|
|
||||||
|
libXvMCgallium_la_SOURCES += target.c
|
||||||
|
libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS)
|
||||||
|
libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)
|
||||||
|
|
||||||
|
else # HAVE_GALLIUM_STATIC_TARGETS
|
||||||
|
|
||||||
|
libXvMCgallium_la_CPPFLAGS = \
|
||||||
|
$(GALLIUM_PIPE_LOADER_DEFINES) \
|
||||||
|
-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
|
||||||
|
|
||||||
|
# XXX: Use the pipe-loader-client over pipe-loader ?
|
||||||
|
libXvMCgallium_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
|
||||||
|
libXvMCgallium_la_LIBADD += $(LLVM_LIBS)
|
||||||
|
libXvMCgallium_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
# hardlink each megadriver instance, but don't actually have
|
||||||
|
# libXvMCgallium.so in the set of final installed files.
|
||||||
|
install-data-hook:
|
||||||
|
$(AM_V_GEN)dest_dir=$(DESTDIR)/$(xvmcdir); \
|
||||||
|
for i in $(MEGADRIVERS); do \
|
||||||
|
j=libXvMCgallium.$(LIB_EXT); \
|
||||||
|
k=libXvMC$${i}.$(LIB_EXT); \
|
||||||
|
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \
|
||||||
|
ln -f $$dest_dir/$$j.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
|
||||||
|
$$dest_dir/$${l}; \
|
||||||
|
ln -sf $${l} \
|
||||||
|
$$dest_dir/$$k.$(XVMC_MAJOR).$(XVMC_MINOR); \
|
||||||
|
ln -sf $${l} \
|
||||||
|
$$dest_dir/$$k.$(XVMC_MAJOR); \
|
||||||
|
ln -sf $${l} \
|
||||||
|
$$dest_dir/$$k; \
|
||||||
|
done; \
|
||||||
|
$(RM) -f $$dest_dir/libXvMCgallium.*
|
|
@ -0,0 +1 @@
|
||||||
|
#include "target-helpers/inline_drm_helper.h"
|
Loading…
Reference in New Issue