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

Similar to previous commit, this allows us to minimise some
of the duplication by compacting all vdpau targets into a
single library.

v2: Include the radeon winsys only when there is a user for it.
v3: Correcly include the winsys. Now with extra brown bag :\

Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>

diff --git a/configure.ac b/configure.ac
index 1750a2b308df0ee4c0cfa6f93169ac215b1ac5e7..d6c2ddf9f64f889931b82c966495800d1e3429e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1950,7 +1950,7 @@ if test -n "$with_gallium_drivers"; then
             if test "x$enable_opencl" = xyes; then
                 LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
             fi
-            gallium_check_st "radeon/drm" "r600/dri" "" "r600/xvmc" "r600/vdpau" "r600/omx"
+            gallium_check_st "radeon/drm" "r600/dri" "" "r600/xvmc" "vdpau/r600" "r600/omx"
             DRICOMMON_NEED_LIBDRM=yes
             ;;
         xradeonsi)
@@ -2221,7 +2221,6 @@ 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/vdpau/Makefile
                src/gallium/targets/r600/xvmc/Makefile
                src/gallium/targets/radeonsi/dri/Makefile
                src/gallium/targets/radeonsi/omx/Makefile

diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index 529087d150407294b48c35e42e71b42f9e1264a4..a2e8bbd9f15cced74a121f5a4e5bf4d45e2062be 100644 (file)
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -85,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

diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am
deleted file mode 100644 (file)
index 1f92c56..0000000
--- a/src/gallium/targets/r600/vdpau/Makefile.am
+++ /dev/null
@@ -1,49 +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)
-
-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 (symlink)
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/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index 23de1c93e6e2afb5e7f5872e7b3e89d6461c3f71..b30d1939cc53e6035e6f68688ebeb47e1bd60f67 100644 (file)
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -48,6 +48,25 @@ STATIC_TARGET_LIB_DEPS += \
        $(NOUVEAU_LIBS)
 endif
 
+# Radeon winsys chaos
+if HAVE_GALLIUM_R600
+STATIC_TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
+endif
+
+if HAVE_GALLIUM_RADEON_COMMON
+STATIC_TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/drivers/radeon/libradeon.la
+endif
+
+if HAVE_GALLIUM_R600
+MEGADRIVERS += r600
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_R600
+STATIC_TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/drivers/r600/libr600.la \
+       $(RADEON_LIBS)
+endif
+
 libvdpau_gallium_la_SOURCES += target.c
 libvdpau_gallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS)
 libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)