Similar to previous commit now one can select if they
want a VL (libXvMC) library that has the pipe-driver
statically linked (the default) or not.
Symlink creation is rather messy and will needs update
for non-linux platforms.
Cc: Jonathan Gray <j...@jsg.id.au>
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
configure.ac | 8 +--
src/gallium/Automake.inc | 18 -------
src/gallium/targets/Makefile.am | 12 ++---
src/gallium/targets/r600/xvmc/Makefile.am | 46 -----------------
src/gallium/targets/r600/xvmc/drm_target.c | 1 -
src/gallium/targets/xvmc-nouveau/Makefile.am | 45 ----------------
src/gallium/targets/xvmc-nouveau/target.c | 18 -------
src/gallium/targets/xvmc.sym | 32 ------------
src/gallium/targets/xvmc/Makefile.am | 77 ++++++++++++++++++++++++++++
src/gallium/targets/xvmc/target.c | 1 +
src/gallium/targets/xvmc/xvmc.sym | 32 ++++++++++++
11 files changed, 118 insertions(+), 172 deletions(-)
delete mode 100644 src/gallium/targets/r600/xvmc/Makefile.am
delete mode 120000 src/gallium/targets/r600/xvmc/drm_target.c
delete mode 100644 src/gallium/targets/xvmc-nouveau/Makefile.am
delete mode 100644 src/gallium/targets/xvmc-nouveau/target.c
delete mode 100644 src/gallium/targets/xvmc.sym
create mode 100644 src/gallium/targets/xvmc/Makefile.am
create mode 100644 src/gallium/targets/xvmc/target.c
create mode 100644 src/gallium/targets/xvmc/xvmc.sym
diff --git a/configure.ac b/configure.ac
index cfd79ba..471c776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1340,6 +1340,7 @@ fi
if test "x$enable_xvmc" = xyes; then
PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb-dri2 >=
$XCBDRI2_REQUIRED])
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc"
+ enable_gallium_loader=yes
fi
AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes)
@@ -2140,8 +2141,6 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/egl-static/Makefile
src/gallium/targets/gbm/Makefile
src/gallium/targets/opencl/Makefile
- src/gallium/targets/xa/Makefile
- src/gallium/targets/xa/xatracker.pc
src/gallium/targets/omx-nouveau/Makefile
src/gallium/targets/osmesa/Makefile
src/gallium/targets/osmesa/osmesa.pc
@@ -2151,10 +2150,11 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/r300/dri/Makefile
src/gallium/targets/r600/dri/Makefile
src/gallium/targets/r600/omx/Makefile
- src/gallium/targets/r600/xvmc/Makefile
src/gallium/targets/libgl-xlib/Makefile
src/gallium/targets/vdpau/Makefile
- src/gallium/targets/xvmc-nouveau/Makefile
+ src/gallium/targets/xa/Makefile
+ src/gallium/targets/xa/xatracker.pc
+ src/gallium/targets/xvmc/Makefile
src/gallium/tests/trivial/Makefile
src/gallium/tests/unit/Makefile
src/gallium/winsys/Makefile
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 3bdd7ab..a9e2554 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -60,15 +60,6 @@ GALLIUM_DRI_LINKER_FLAGS = \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym \
$(GC_SECTIONS)
-GALLIUM_XVMC_LINKER_FLAGS = \
- -shared \
- -module \
- -no-undefined \
- -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc.sym \
- $(GC_SECTIONS) \
- $(LD_NO_UNDEFINED)
-
GALLIUM_OMX_LINKER_FLAGS = \
-shared \
-module \
@@ -92,13 +83,6 @@ GALLIUM_DRI_LIB_DEPS = \
$(EXPAT_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 \
- $(XVMC_LIBS) \
- $(LIBDRM_LIBS) \
- $(GALLIUM_COMMON_LIB_DEPS)
-
GALLIUM_OMX_LIB_DEPS = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
@@ -219,11 +203,9 @@ endif
if HAVE_MESA_LLVM
GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS)
-GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS)
GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS)
GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS)
-GALLIUM_XVMC_LIB_DEPS += $(LLVM_LIBS)
GALLIUM_OMX_LIB_DEPS += $(LLVM_LIBS)
endif
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index 97c0931..b4d6171 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -42,6 +42,10 @@ if HAVE_ST_XA
SUBDIRS += xa
endif
+if HAVE_ST_XVMC
+SUBDIRS += xvmc
+endif
+
if HAVE_CLOVER
SUBDIRS += opencl
endif
@@ -81,10 +85,6 @@ if HAVE_DRI
SUBDIRS += r600/dri
endif
-if HAVE_ST_XVMC
-SUBDIRS += r600/xvmc
-endif
-
if HAVE_ST_OMX
SUBDIRS += r600/omx
endif
@@ -105,10 +105,6 @@ if HAVE_DRI
SUBDIRS += dri-nouveau
endif
-if HAVE_ST_XVMC
-SUBDIRS += xvmc-nouveau
-endif
-
if HAVE_ST_OMX
SUBDIRS += omx-nouveau
endif
diff --git a/src/gallium/targets/r600/xvmc/Makefile.am
b/src/gallium/targets/r600/xvmc/Makefile.am
deleted file mode 100644
index f2aec1a..0000000
--- a/src/gallium/targets/r600/xvmc/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_CPPFLAGS = \
- -DSPLIT_TARGETS=1
-AM_CFLAGS = \
- $(GALLIUM_VIDEO_CFLAGS)
-
-xvmcdir = $(XVMC_LIB_INSTALL_DIR)
-xvmc_LTLIBRARIES = libXvMCr600.la
-
-nodist_EXTRA_libXvMCr600_la_SOURCES = dummy.cpp
-libXvMCr600_la_SOURCES = \
- drm_target.c \
- $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
-
-libXvMCr600_la_LDFLAGS = \
- $(GALLIUM_XVMC_LINKER_FLAGS)
-
-libXvMCr600_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_XVMC_LIB_DEPS) \
- $(RADEON_LIBS)
diff --git a/src/gallium/targets/r600/xvmc/drm_target.c
b/src/gallium/targets/r600/xvmc/drm_target.c
deleted file mode 120000
index 6955421..0000000
--- a/src/gallium/targets/r600/xvmc/drm_target.c
+++ /dev/null
@@ -1 +0,0 @@
-../common/drm_target.c
\ No newline at end of file
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am
b/src/gallium/targets/xvmc-nouveau/Makefile.am
deleted file mode 100644
index e1061cd..0000000
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ /dev/null
@@ -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)
diff --git a/src/gallium/targets/xvmc-nouveau/target.c
b/src/gallium/targets/xvmc-nouveau/target.c
deleted file mode 100644
index d580b10..0000000
--- a/src/gallium/targets/xvmc-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/xvmc.sym b/src/gallium/targets/xvmc.sym
deleted file mode 100644
index f51378e..0000000
--- a/src/gallium/targets/xvmc.sym
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- global:
- XvMCBlendSubpicture;
- XvMCBlendSubpicture2;
- XvMCClearSubpicture;
- XvMCCompositeSubpicture;
- XvMCCreateBlocks;
- XvMCCreateContext;
- XvMCCreateMacroBlocks;
- XvMCCreateSubpicture;
- XvMCCreateSurface;
- XvMCDestroyBlocks;
- XvMCDestroyContext;
- XvMCDestroyMacroBlocks;
- XvMCDestroySubpicture;
- XvMCDestroySurface;
- XvMCFlushSubpicture;
- XvMCFlushSurface;
- XvMCGetAttribute;
- XvMCGetSubpictureStatus;
- XvMCGetSurfaceStatus;
- XvMCHideSurface;
- XvMCPutSurface;
- XvMCQueryAttributes;
- XvMCRenderSurface;
- XvMCSetAttribute;
- XvMCSetSubpicturePalette;
- XvMCSyncSubpicture;
- XvMCSyncSurface;
- local:
- *;
-};
diff --git a/src/gallium/targets/xvmc/Makefile.am
b/src/gallium/targets/xvmc/Makefile.am
new file mode 100644
index 0000000..6c2a2e5
--- /dev/null
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -0,0 +1,77 @@
+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) \
+ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc/xvmc.sym \
+ $(GC_SECTIONS) \
+ $(LD_NO_UNDEFINED)
+
+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
+
+libXvMCgallium_la_SOURCES += target.c
+libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS)
+libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)
+
+if HAVE_GALLIUM_R300
+libXvMCgallium_la_LIBADD += \
+ $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la
+endif
+
+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.*
diff --git a/src/gallium/targets/xvmc/target.c
b/src/gallium/targets/xvmc/target.c
new file mode 100644
index 0000000..fde4a4a
--- /dev/null
+++ b/src/gallium/targets/xvmc/target.c
@@ -0,0 +1 @@
+#include "target-helpers/inline_drm_helper.h"
diff --git a/src/gallium/targets/xvmc/xvmc.sym
b/src/gallium/targets/xvmc/xvmc.sym
new file mode 100644
index 0000000..f51378e
--- /dev/null
+++ b/src/gallium/targets/xvmc/xvmc.sym
@@ -0,0 +1,32 @@
+{
+ global:
+ XvMCBlendSubpicture;
+ XvMCBlendSubpicture2;
+ XvMCClearSubpicture;
+ XvMCCompositeSubpicture;
+ XvMCCreateBlocks;
+ XvMCCreateContext;
+ XvMCCreateMacroBlocks;
+ XvMCCreateSubpicture;
+ XvMCCreateSurface;
+ XvMCDestroyBlocks;
+ XvMCDestroyContext;
+ XvMCDestroyMacroBlocks;
+ XvMCDestroySubpicture;
+ XvMCDestroySurface;
+ XvMCFlushSubpicture;
+ XvMCFlushSurface;
+ XvMCGetAttribute;
+ XvMCGetSubpictureStatus;
+ XvMCGetSurfaceStatus;
+ XvMCHideSurface;
+ XvMCPutSurface;
+ XvMCQueryAttributes;
+ XvMCRenderSurface;
+ XvMCSetAttribute;
+ XvMCSetSubpicturePalette;
+ XvMCSyncSubpicture;
+ XvMCSyncSurface;
+ local:
+ *;
+};
--
1.9.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
