gallium/targets: remove xvmc-softpipe
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Marek Olšák
parent
0e17c12fa7
commit
7c2531847f
|
|
@ -1831,9 +1831,6 @@ if test "x$with_gallium_drivers" != x; then
|
|||
if test "x$enable_vdpau" = xyes; then
|
||||
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS vdpau-softpipe"
|
||||
fi
|
||||
if test "x$enable_xvmc" = xyes; then
|
||||
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS xvmc-softpipe"
|
||||
fi
|
||||
if test "x$enable_vdpau" = xyes -o "x$enable_xvmc" = xyes; then
|
||||
NEED_WINSYS_XLIB=yes
|
||||
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
|
||||
|
|
@ -2056,7 +2053,6 @@ AC_CONFIG_FILES([Makefile
|
|||
src/gallium/targets/xorg-i915/Makefile
|
||||
src/gallium/targets/xorg-nouveau/Makefile
|
||||
src/gallium/targets/xvmc-nouveau/Makefile
|
||||
src/gallium/targets/xvmc-softpipe/Makefile
|
||||
src/gallium/tests/trivial/Makefile
|
||||
src/gallium/tests/unit/Makefile
|
||||
src/gallium/winsys/Makefile
|
||||
|
|
|
|||
|
|
@ -123,10 +123,6 @@ if HAVE_DRI
|
|||
SUBDIRS += dri-swrast
|
||||
endif
|
||||
|
||||
if HAVE_ST_XVMC
|
||||
SUBDIRS += xvmc-softpipe
|
||||
endif
|
||||
|
||||
if HAVE_ST_VDPAU
|
||||
SUBDIRS += vdpau-softpipe
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
xvmcdir = $(XVMC_LIB_INSTALL_DIR)
|
||||
xvmc_LTLIBRARIES = libXvMCsoftpipe.la
|
||||
|
||||
libXvMCsoftpipe_la_SOURCES = \
|
||||
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
|
||||
|
||||
libXvMCsoftpipe_la_LDFLAGS = \
|
||||
-module \
|
||||
-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
|
||||
-shared \
|
||||
-no-undefined
|
||||
|
||||
libXvMCsoftpipe_la_LIBADD = \
|
||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||
$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
|
||||
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
|
||||
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
|
||||
$(XVMC_LIBS) \
|
||||
$(DLOPEN_LIBS) \
|
||||
$(LIBDRM_LIBS)
|
||||
|
||||
if HAVE_MESA_LLVM
|
||||
libXvMCsoftpipe_la_LINK = $(CXXLINK) $(libXvMCsoftpipe_la_LDFLAGS)
|
||||
# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
|
||||
nodist_EXTRA_libXvMCsoftpipe_la_SOURCES = dummy-cpp.cpp
|
||||
|
||||
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
|
||||
libXvMCsoftpipe_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
|
||||
else
|
||||
libXvMCsoftpipe_la_LINK = $(LINK) $(libXvMCsoftpipe_la_LDFLAGS)
|
||||
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
|
||||
nodist_EXTRA_libXvMCsoftpipe_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: libXvMCsoftpipe.la
|
||||
$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
|
||||
ln -f .libs/libXvMCsoftpipe.so* $(top_builddir)/$(LIB_DIR)/gallium/
|
||||
Loading…
Reference in New Issue