targets/radeonsi/omx: convert to static/shared pipe-drivers

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 <[email protected]>
Cc: Christian König <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Christian König <[email protected]>

5 files changed, 12 insertions, 72 deletions

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 0d5830cb871..3e2071d91ea 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -59,20 +59,10 @@ GALLIUM_DRI_LINKER_FLAGS = \
 	-avoid-version \
 	$(GC_SECTIONS)
 
-GALLIUM_OMX_LINKER_FLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	-avoid-version \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
 if HAVE_LD_VERSION_SCRIPT
 GALLIUM_DRI_LINKER_FLAGS += \
 	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym
 
-GALLIUM_OMX_LINKER_FLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx/omx.sym
 endif
 
 
@@ -90,12 +80,6 @@ GALLIUM_DRI_LIB_DEPS = \
 	$(EXPAT_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 \
-	$(OMX_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
 GALLIUM_WINSYS_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gallium/include \
@@ -104,13 +88,8 @@ GALLIUM_WINSYS_CFLAGS = \
 	$(VISIBILITY_CFLAGS)
 
 if HAVE_MESA_LLVM
-
 GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS)
-GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS)
-
 GALLIUM_DRI_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 9612eb2b2ad..d86cd33af94 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -94,10 +94,6 @@ if HAVE_GALLIUM_RADEONSI
 if HAVE_DRI2
 SUBDIRS += radeonsi/dri
 endif
-
-if HAVE_ST_OMX
-SUBDIRS += radeonsi/omx
-endif
 endif
 
 if HAVE_GALLIUM_NOUVEAU
diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am
index 736ee0e7ada..ac43c80417b 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -47,6 +47,11 @@ endif
 if HAVE_GALLIUM_R600
 STATIC_TARGET_LIB_DEPS += \
 	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
+else
+if HAVE_GALLIUM_RADEONSI
+STATIC_TARGET_LIB_DEPS += \
+	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
+endif
 endif
 
 if HAVE_GALLIUM_RADEON_COMMON
@@ -61,6 +66,13 @@ STATIC_TARGET_LIB_DEPS += \
 	$(RADEON_LIBS)
 endif
 
+if HAVE_GALLIUM_RADEONSI
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_RADEONSI
+STATIC_TARGET_LIB_DEPS += \
+	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
+	$(RADEON_LIBS)
+endif
+
 libomx_mesa_la_SOURCES += target.c
 libomx_mesa_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS)
 libomx_mesa_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)
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