Only one library for all hardware and one for software targets
is created. Drivers interact with the library using the
pipe-loader scheme.
Currently software vdpau library is created for testing
and POC reasons. Note that it's in the same buggy state as
to prior it's removal a while back.
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
configure.ac | 10 ++-
src/gallium/auxiliary/vl/vl_winsys.h | 3 +
src/gallium/auxiliary/vl/vl_winsys_dri.c | 9 ++-
src/gallium/auxiliary/vl/vl_winsys_xsp.c | 25 ++++----
src/gallium/targets/Makefile.am | 16 ++---
src/gallium/targets/r600/vdpau/Makefile.am | 64 -------------------
src/gallium/targets/r600/vdpau/drm_target.c | 1 -
src/gallium/targets/radeonsi/vdpau/Makefile.am | 57 -----------------
src/gallium/targets/radeonsi/vdpau/drm_target.c | 1 -
src/gallium/targets/vdpau-nouveau/Makefile.am | 57 -----------------
src/gallium/targets/vdpau-nouveau/target.c | 18 ------
src/gallium/targets/vdpau/Makefile.am | 83 +++++++++++++++++++++++++
12 files changed, 116 insertions(+), 228 deletions(-)
delete mode 100644 src/gallium/targets/r600/vdpau/Makefile.am
delete mode 120000 src/gallium/targets/r600/vdpau/drm_target.c
delete mode 100644 src/gallium/targets/radeonsi/vdpau/Makefile.am
delete mode 120000 src/gallium/targets/radeonsi/vdpau/drm_target.c
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
diff --git a/configure.ac b/configure.ac
index 8bf9b94..1b3def9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1327,6 +1327,7 @@ AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes)
if test "x$enable_vdpau" = xyes; then
PKG_CHECK_MODULES([VDPAU], [vdpau >= 0.4.1 x11-xcb xcb-dri2 >= 1.8])
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau"
+ enable_gallium_loader=yes
fi
AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes)
@@ -1754,6 +1755,11 @@ if test "x$enable_dri" = xyes -o "x$enable_xa" = xyes -o
\
fi
AM_CONDITIONAL(NEED_NONNULL_WINSYS, test "x$NEED_NONNULL_WINSYS" = xyes)
+if test "x$enable_xvmc" = xyes -o "x$enable_vdpau" = xyes -o \
+ "x$enable_omx" = xyes; then
+ NEED_WINSYS_XLIB=yes
+fi
+
dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this
block
if test "x$with_gallium_drivers" != x; then
gallium_drivers=`IFS=', '; echo $with_gallium_drivers`
@@ -2049,14 +2055,12 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/pipe-loader/Makefile
src/gallium/targets/radeonsi/dri/Makefile
src/gallium/targets/radeonsi/omx/Makefile
- src/gallium/targets/radeonsi/vdpau/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/libgl-xlib/Makefile
- src/gallium/targets/vdpau-nouveau/Makefile
+ src/gallium/targets/vdpau/Makefile
src/gallium/targets/xa-vmwgfx/Makefile
src/gallium/targets/xa-vmwgfx/xatracker.pc
src/gallium/targets/xvmc-nouveau/Makefile
diff --git a/src/gallium/auxiliary/vl/vl_winsys.h
b/src/gallium/auxiliary/vl/vl_winsys.h
index a433f1b..96eb585 100644
--- a/src/gallium/auxiliary/vl/vl_winsys.h
+++ b/src/gallium/auxiliary/vl/vl_winsys.h
@@ -38,12 +38,15 @@
#include "pipe/p_defines.h"
#include "pipe/p_format.h"
+#include "pipe-loader/pipe_loader.h"
+
struct pipe_screen;
struct pipe_surface;
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 5d83e57..9070efe 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_dri.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c
@@ -375,10 +375,11 @@ vl_screen_create(Display *display, int screen)
if (authenticate == NULL || !authenticate->authenticated)
goto free_authenticate;
- scrn->base.pscreen = driver_descriptor.create_screen(fd);
+ if (pipe_loader_drm_probe_fd(&scrn->base.dev, fd))
+ scrn->base.pscreen = pipe_loader_create_screen(scrn->base.dev,
PIPE_SEARCH_DIR);
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 +392,9 @@ vl_screen_create(Display *display, int screen)
return &scrn->base;
+release_pipe:
+ if (scrn->base.dev)
+ pipe_loader_release(&scrn->base.dev, 1);
free_authenticate:
free(authenticate);
free_connect:
@@ -418,5 +422,6 @@ void vl_screen_destroy(struct vl_screen *vscreen)
vl_dri2_destroy_drawable(scrn);
scrn->base.pscreen->destroy(scrn->base.pscreen);
+ pipe_loader_release(&scrn->base.dev, 1);
FREE(scrn);
}
diff --git a/src/gallium/auxiliary/vl/vl_winsys_xsp.c
b/src/gallium/auxiliary/vl/vl_winsys_xsp.c
index 57f17bc..ea68bd7 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_xsp.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_xsp.c
@@ -41,7 +41,7 @@
#include "vl/vl_compositor.h"
#include "vl/vl_winsys.h"
-#include "winsys/sw/xlib/xlib_sw_winsys.h"
+#include "sw/xlib/xlib_sw_winsys.h"
struct vl_xsp_screen
{
@@ -131,7 +131,6 @@ struct vl_screen*
vl_screen_create(Display *display, int screen)
{
struct vl_xsp_screen *xsp_screen;
- struct sw_winsys *winsys;
assert(display);
@@ -139,18 +138,11 @@ vl_screen_create(Display *display, int screen)
if (!xsp_screen)
return NULL;
- winsys = xlib_create_sw_winsys(display);
- if (!winsys) {
- FREE(xsp_screen);
- return NULL;
- }
+ if (pipe_loader_sw_probe_xlib(&xsp_screen->base.dev, display))
+ xsp_screen->base.pscreen =
pipe_loader_create_screen(xsp_screen->base.dev, PIPE_SEARCH_DIR);
- xsp_screen->base.pscreen = softpipe_create_screen(winsys);
- if (!xsp_screen->base.pscreen) {
- winsys->destroy(winsys);
- FREE(xsp_screen);
- return NULL;
- }
+ if (!xsp_screen->base.pscreen)
+ goto release_pipe;
xsp_screen->display = display;
xsp_screen->screen = screen;
@@ -158,6 +150,12 @@ vl_screen_create(Display *display, int screen)
vl_compositor_reset_dirty_area(&xsp_screen->dirty_area);
return &xsp_screen->base;
+
+release_pipe:
+ if (xsp_screen->base.dev)
+ pipe_loader_release(&xsp_screen->base.dev, 1);
+ FREE(xsp_screen);
+ return NULL;
}
void vl_screen_destroy(struct vl_screen *vscreen)
@@ -168,5 +166,6 @@ void vl_screen_destroy(struct vl_screen *vscreen)
pipe_resource_reference(&xsp_screen->tex, NULL);
vscreen->pscreen->destroy(vscreen->pscreen);
+ pipe_loader_release(&xsp_screen->base.dev, 1);
FREE(vscreen);
}
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index a336914..0f79a2e 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -38,6 +38,10 @@ if HAVE_CLOVER
SUBDIRS += opencl
endif
+if HAVE_ST_VDPAU
+SUBDIRS += vdpau
+endif
+
if HAVE_GALLIUM_SVGA
if HAVE_DRI
SUBDIRS += dri-vmwgfx
@@ -81,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
@@ -95,10 +95,6 @@ if HAVE_DRI
SUBDIRS += radeonsi/dri
endif
-if HAVE_ST_VDPAU
-SUBDIRS += radeonsi/vdpau
-endif
-
if HAVE_ST_OMX
SUBDIRS += radeonsi/omx
endif
@@ -112,10 +108,6 @@ endif
if HAVE_ST_XVMC
SUBDIRS += xvmc-nouveau
endif
-
-if HAVE_ST_VDPAU
-SUBDIRS += vdpau-nouveau
-endif
endif
if HAVE_GALLIUM_SOFTPIPE
diff --git a/src/gallium/targets/r600/vdpau/Makefile.am
b/src/gallium/targets/r600/vdpau/Makefile.am
deleted file mode 100644
index 7f43fbb..0000000
--- a/src/gallium/targets/r600/vdpau/Makefile.am
+++ /dev/null
@@ -1,64 +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.
-
-# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc
-VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$'
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
- $(GALLIUM_VIDEO_CFLAGS)
-
-vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
-vdpau_LTLIBRARIES = libvdpau_r600.la
-
-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)
-
-libvdpau_r600_la_LIBADD = \
- $(top_builddir)/src/gallium/drivers/r600/libr600.la \
- $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
- $(GALLIUM_VDPAU_LIB_DEPS) \
- $(GALLIUM_DRI_LIB_DEPS) \
- $(RADEON_LIBS)
-
-if HAVE_MESA_LLVM
-libvdpau_r600_la_LINK = $(CXXLINK) $(libvdpau_r600_la_LDFLAGS)
-# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
-nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-cpp.cpp
-
-libvdpau_r600_la_LDFLAGS += $(LLVM_LDFLAGS)
-libvdpau_r600_la_LIBADD += $(LLVM_LIBS)
-else
-libvdpau_r600_la_LINK = $(LINK) $(libvdpau_r600_la_LDFLAGS)
-# Mention a dummy pure C file to trigger generation of the $(LINK) variable
-nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-c.c
-endif
-
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: libvdpau_r600.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libvdpau_r600.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git a/src/gallium/targets/r600/vdpau/drm_target.c
b/src/gallium/targets/r600/vdpau/drm_target.c
deleted file mode 120000
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/radeonsi/vdpau/Makefile.am
b/src/gallium/targets/radeonsi/vdpau/Makefile.am
deleted file mode 100644
index 0292b2b..0000000
--- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
+++ /dev/null
@@ -1,57 +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.
-
-# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc
-VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$'
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
- $(GALLIUM_VIDEO_CFLAGS)
-
-vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
-vdpau_LTLIBRARIES = libvdpau_radeonsi.la
-
-nodist_EXTRA_libvdpau_radeonsi_la_SOURCES = dummy.cpp
-libvdpau_radeonsi_la_SOURCES = \
- drm_target.c \
- $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
-
-libvdpau_radeonsi_la_LDFLAGS = \
- $(GALLIUM_VDPAU_LINKER_FLAGS)
-
-libvdpau_radeonsi_la_LIBADD = \
- $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
- $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
- $(GALLIUM_VDPAU_LIB_DEPS) \
- $(GALLIUM_DRI_LIB_DEPS) \
- $(RADEON_LIBS)
-
-if HAVE_MESA_LLVM
-libvdpau_radeonsi_la_LDFLAGS += $(LLVM_LDFLAGS)
-libvdpau_radeonsi_la_LIBADD += $(LLVM_LIBS)
-endif
-
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: libvdpau_radeonsi.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libvdpau_radeonsi.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git a/src/gallium/targets/radeonsi/vdpau/drm_target.c
b/src/gallium/targets/radeonsi/vdpau/drm_target.c
deleted file mode 120000
index 6955421..0000000
--- a/src/gallium/targets/radeonsi/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-nouveau/Makefile.am
b/src/gallium/targets/vdpau-nouveau/Makefile.am
deleted file mode 100644
index fbaad03..0000000
--- a/src/gallium/targets/vdpau-nouveau/Makefile.am
+++ /dev/null
@@ -1,57 +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.
-
-# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc
-VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|nouveau_drm_screen_create)$$'
-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)
-
-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) \
- $(GALLIUM_DRI_LIB_DEPS) \
- $(NOUVEAU_LIBS)
-
-if HAVE_MESA_LLVM
-libvdpau_nouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
-libvdpau_nouveau_la_LIBADD += $(LLVM_LIBS)
-endif
-
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: libvdpau_nouveau.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libvdpau_nouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git a/src/gallium/targets/vdpau-nouveau/target.c
b/src/gallium/targets/vdpau-nouveau/target.c
deleted file mode 100644
index d580b10..0000000
--- 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 0000000..fac3215
--- /dev/null
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -0,0 +1,83 @@
+# 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.
+
+# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc
+VDPAU_EXPORTS =
'^(vdp_imp_device_create_x11|nouveau_drm_screen_create|radeon_drm_winsys_create)$$'
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+ $(GALLIUM_PIPE_LOADER_DEFINES) \
+ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
+ $(GALLIUM_VIDEO_CFLAGS)
+
+vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
+vdpau_LTLIBRARIES = libvdpau_gallium_dri.la libvdpau_gallium_sw.la
+
+COMMON_LDFLAGS = \
+ -module \
+ -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
+ -export-symbols-regex $(VDPAU_EXPORTS) \
+ -shared \
+ -no-undefined
+
+COMMON_LIBADD = \
+ $(GALLIUM_PIPE_LOADER_LIBS) \
+ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
+ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
+ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
+ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
+ $(VDPAU_LIBS) \
+ $(GALLIUM_DRI_LIB_DEPS)
+
+nodist_EXTRA_libvdpau_gallium_dri_la_SOURCES = dummy.cpp
+libvdpau_gallium_dri_la_SOURCES = \
+ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+libvdpau_gallium_dri_la_LDFLAGS = \
+ $(COMMON_LDFLAGS)
+
+libvdpau_gallium_dri_la_LIBADD = \
+ $(COMMON_LIBADD)
+
+if HAVE_MESA_LLVM
+libvdpau_gallium_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
+libvdpau_gallium_dri_la_LIBADD += $(LLVM_LIBS)
+endif
+
+libvdpau_gallium_sw_la_CPPFLAGS = -DHAVE_WINSYS_XLIB
+
+nodist_EXTRA_libvdpau_gallium_sw_la_SOURCES = dummy.cpp
+libvdpau_gallium_sw_la_SOURCES = \
+ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
+
+libvdpau_gallium_sw_la_LDFLAGS = \
+ $(COMMON_LDFLAGS)
+
+libvdpau_gallium_sw_la_LIBADD = \
+ $(COMMON_LIBADD)
+
+if HAVE_MESA_LLVM
+libvdpau_gallium_sw_la_LDFLAGS += $(LLVM_LDFLAGS)
+libvdpau_gallium_sw_la_LIBADD += $(LLVM_LIBS)
+endif
--
1.8.5.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
