From 11bce6a94e93562a5076d65bc96db36bab599459 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 21 Jun 2014 12:38:30 +0100 Subject: targets/radeonsi/omx: convert to static/shared pipe-drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The radeonsi counterpart of previous commit - now libomx-radeonsi is built into the libomx-mesa library. Providing a single library per API. v2: Include the radeon winsys only when there is a user for it. v3: Correcly include the winsys. Now with extra brown bag :\ Note: Make sure to rebuild the .omxregister file, by executing $ omxregister-bellagio This patch concludes the unification. Now libomx-mesa will be used for all hardware - r600, radeonsi and nouveau. Cc: Leo Liu Cc: Christian König Signed-off-by: Emil Velikov Reviewed-by: Christian König --- src/gallium/targets/radeonsi/omx/Makefile.am | 46 --------------------------- src/gallium/targets/radeonsi/omx/drm_target.c | 1 - 2 files changed, 47 deletions(-) delete mode 100644 src/gallium/targets/radeonsi/omx/Makefile.am delete mode 120000 src/gallium/targets/radeonsi/omx/drm_target.c (limited to 'src/gallium/targets/radeonsi') diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am deleted file mode 100644 index 3c8cf11bd9c..00000000000 --- a/src/gallium/targets/radeonsi/omx/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) - -omxdir = $(OMX_LIB_INSTALL_DIR) -omx_LTLIBRARIES = libomx_radeonsi.la - -nodist_EXTRA_libomx_radeonsi_la_SOURCES = dummy.cpp -libomx_radeonsi_la_SOURCES = \ - drm_target.c \ - $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c - -libomx_radeonsi_la_LDFLAGS = $(GALLIUM_OMX_LINKER_FLAGS) - -libomx_radeonsi_la_LIBADD = \ - $(top_builddir)/src/gallium/drivers/radeon/libradeon.la \ - $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ - $(GALLIUM_OMX_LIB_DEPS) \ - $(LIBDRM_LIBS) \ - $(RADEON_LIBS) diff --git a/src/gallium/targets/radeonsi/omx/drm_target.c b/src/gallium/targets/radeonsi/omx/drm_target.c deleted file mode 120000 index 6955421104a..00000000000 --- a/src/gallium/targets/radeonsi/omx/drm_target.c +++ /dev/null @@ -1 +0,0 @@ -../common/drm_target.c \ No newline at end of file -- cgit v1.2.3