diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/Automake.inc | 20 | ||||
| -rw-r--r-- | src/gallium/targets/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gallium/targets/r600/xvmc/Makefile.am | 46 | ||||
| l--------- | src/gallium/targets/r600/xvmc/drm_target.c | 1 | ||||
| -rw-r--r-- | src/gallium/targets/xvmc/Makefile.am | 10 |
5 files changed, 10 insertions, 71 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index 89b76583d2e..8bf2a12e806 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -59,14 +59,6 @@ GALLIUM_DRI_LINKER_FLAGS = \ -avoid-version \ $(GC_SECTIONS) -GALLIUM_XVMC_LINKER_FLAGS = \ - -shared \ - -module \ - -no-undefined \ - -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - GALLIUM_OMX_LINKER_FLAGS = \ -shared \ -module \ @@ -79,9 +71,6 @@ if HAVE_LD_VERSION_SCRIPT GALLIUM_DRI_LINKER_FLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym -GALLIUM_XVMC_LINKER_FLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc/xvmc.sym - GALLIUM_OMX_LINKER_FLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym endif @@ -101,13 +90,6 @@ GALLIUM_DRI_LIB_DEPS = \ $(EXPAT_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) -GALLIUM_XVMC_LIB_DEPS = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \ - $(XVMC_LIBS) \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - GALLIUM_OMX_LIB_DEPS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \ @@ -124,11 +106,9 @@ GALLIUM_WINSYS_CFLAGS = \ if HAVE_MESA_LLVM GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS) -GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS) GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS) GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS) -GALLIUM_XVMC_LIB_DEPS += $(LLVM_LIBS) GALLIUM_OMX_LIB_DEPS += $(LLVM_LIBS) endif diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index 0fbf0d7a34f..e96224eaf35 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -85,10 +85,6 @@ if HAVE_DRI2 SUBDIRS += r600/dri endif -if HAVE_ST_XVMC -SUBDIRS += r600/xvmc -endif - if HAVE_ST_OMX SUBDIRS += r600/omx endif 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 diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 44b40043e25..227fde668a7 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -47,6 +47,16 @@ STATIC_TARGET_LIB_DEPS += \ $(NOUVEAU_LIBS) endif +if HAVE_GALLIUM_R600 +MEGADRIVERS += r600 +STATIC_TARGET_CPPFLAGS += -DGALLIUM_R600 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ + $(top_builddir)/src/gallium/drivers/radeon/libradeon.la \ + $(top_builddir)/src/gallium/drivers/r600/libr600.la \ + $(RADEON_LIBS) +endif + libXvMCgallium_la_SOURCES += target.c libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) |