From df71b39f5c5cef375ec1124e32b21cbb10acb0b2 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 12 Jun 2014 16:59:58 +0100 Subject: targets/r600/xvmc: convert to static/shared pipe-drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The r600 equivalent of previous commit. v2: Correctly include the radeon winsys/radeon_common. Cc: Christian König Signed-off-by: Emil Velikov Reviewed-by: Christian König Tested-by: Thomas Helland --- src/gallium/targets/r600/xvmc/Makefile.am | 46 ------------------------------ src/gallium/targets/r600/xvmc/drm_target.c | 1 - 2 files changed, 47 deletions(-) delete mode 100644 src/gallium/targets/r600/xvmc/Makefile.am delete mode 120000 src/gallium/targets/r600/xvmc/drm_target.c (limited to 'src/gallium/targets/r600') diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am deleted file mode 100644 index f2aec1a7122..00000000000 --- 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 6955421104a..00000000000 --- a/src/gallium/targets/r600/xvmc/drm_target.c +++ /dev/null @@ -1 +0,0 @@ -../common/drm_target.c \ No newline at end of file -- cgit v1.2.3