diff options
author | Marek Olšák <[email protected]> | 2013-11-02 12:20:29 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2013-11-02 23:34:01 +0100 |
commit | fa8b1514d31d1ffb3d9e2a208ac7d1bd774754b2 (patch) | |
tree | 1a35307a1021444118cabcab1b47aeef194ce667 /src/gallium | |
parent | 7c2531847fba8c8eaac287936a20dc07612d4b59 (diff) |
gallium/targets: remove vdpau-softpipe
Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/targets/Makefile.am | 4 | ||||
-rw-r--r-- | src/gallium/targets/vdpau-softpipe/Makefile.am | 72 |
2 files changed, 0 insertions, 76 deletions
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index bfe22a2fc19..46d7ad0de95 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -122,10 +122,6 @@ if HAVE_GALLIUM_SOFTPIPE if HAVE_DRI SUBDIRS += dri-swrast endif - -if HAVE_ST_VDPAU -SUBDIRS += vdpau-softpipe -endif endif if NEED_GALLIUM_LOADER diff --git a/src/gallium/targets/vdpau-softpipe/Makefile.am b/src/gallium/targets/vdpau-softpipe/Makefile.am deleted file mode 100644 index 7bde2f8d5ae..00000000000 --- a/src/gallium/targets/vdpau-softpipe/Makefile.am +++ /dev/null @@ -1,72 +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_CFLAGS) \ - $(PTHREAD_CFLAGS) \ - $(LIBDRM_CFLAGS) -AM_CPPFLAGS = \ - -DGALLIUM_SOFTPIPE \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys - -vdpaudir = $(VDPAU_LIB_INSTALL_DIR) -vdpau_LTLIBRARIES = libvdpau_softpipe.la - -libvdpau_softpipe_la_SOURCES = \ - $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_xsp.c - -libvdpau_softpipe_la_LDFLAGS = \ - -module \ - -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - -shared \ - -no-undefined - -libvdpau_softpipe_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ - $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ - $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ - $(VDPAU_LIBS) \ - $(DLOPEN_LIBS) \ - $(LIBDRM_LIBS) - -if HAVE_MESA_LLVM -libvdpau_softpipe_la_LINK = $(CXXLINK) $(libvdpau_softpipe_la_LDFLAGS) -# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable -nodist_EXTRA_libvdpau_softpipe_la_SOURCES = dummy-cpp.cpp - -AM_CPPFLAGS += -DGALLIUM_LLVMPIPE -libvdpau_softpipe_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) -else -libvdpau_softpipe_la_LINK = $(LINK) $(libvdpau_softpipe_la_LDFLAGS) -# Mention a dummy pure C file to trigger generation of the $(LINK) variable -nodist_EXTRA_libvdpau_softpipe_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_softpipe.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libvdpau_softpipe.so* $(top_builddir)/$(LIB_DIR)/gallium/ |