[Mesa-dev] [PATCHv2] targets/r600/omx: convert to static/shared pipe-drivers

[Emil Velikov]

The r600 counterpart of previous commit - now the libomx-r600 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.

Cc: Leo Liu <leo.liu at amd.com>
Cc: Christian König <christian.koenig at amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 configure.ac                              |  3 +-
 src/gallium/targets/Makefile.am           |  4 ---
 src/gallium/targets/omx/Makefile.am       | 21 ++++++++++++++
 src/gallium/targets/r600/omx/Makefile.am  | 46 -------------------------------
 src/gallium/targets/r600/omx/drm_target.c |  1 -
 5 files changed, 22 insertions(+), 53 deletions(-)
 delete mode 100644 src/gallium/targets/r600/omx/Makefile.am
 delete mode 120000 src/gallium/targets/r600/omx/drm_target.c

diff --git a/configure.ac b/configure.ac
index a44532b..8daeb5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1956,7 +1956,7 @@ if test -n "$with_gallium_drivers"; then
             if test "x$enable_opencl" = xyes; then
                 LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
             fi
-            gallium_check_st "radeon/drm" "r600/dri" "" "xvmc/r600" "vdpau/r600" "r600/omx"
+            gallium_check_st "radeon/drm" "r600/dri" "" "xvmc/r600" "vdpau/r600" "omx/r600"
             DRICOMMON_NEED_LIBDRM=yes
             ;;
         xradeonsi)
@@ -2227,7 +2227,6 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/targets/pipe-loader/Makefile
 		src/gallium/targets/r300/dri/Makefile
 		src/gallium/targets/r600/dri/Makefile
-		src/gallium/targets/r600/omx/Makefile
 		src/gallium/targets/radeonsi/dri/Makefile
 		src/gallium/targets/radeonsi/omx/Makefile
 		src/gallium/targets/vdpau/Makefile
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index 1af0c44..9612eb2 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -88,10 +88,6 @@ if HAVE_GALLIUM_R600
 if HAVE_DRI2
 SUBDIRS += r600/dri
 endif
-
-if HAVE_ST_OMX
-SUBDIRS += r600/omx
-endif
 endif
 
 if HAVE_GALLIUM_RADEONSI
diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am
index cd79a44..03b3167 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -43,6 +43,27 @@ STATIC_TARGET_LIB_DEPS += \
 	$(NOUVEAU_LIBS)
 endif
 
+if NEED_RADEON_DRM_WINSYS
+if !HAVE_GALLIUM_R300
+if !HAVE_GALLIUM_RADEONSI
+STATIC_TARGET_LIB_DEPS += \
+	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
+endif
+endif
+endif
+
+if HAVE_GALLIUM_RADEON_COMMON
+STATIC_TARGET_LIB_DEPS += \
+	$(top_builddir)/src/gallium/drivers/radeon/libradeon.la
+endif
+
+if HAVE_GALLIUM_R600
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_R600
+STATIC_TARGET_LIB_DEPS += \
+	$(top_builddir)/src/gallium/drivers/r600/libr600.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/r600/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am
deleted file mode 100644
index 8d011cc..0000000
--- a/src/gallium/targets/r600/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_r600.la
-
-nodist_EXTRA_libomx_r600_la_SOURCES = dummy.cpp
-libomx_r600_la_SOURCES = \
-	drm_target.c \
-	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
-
-libomx_r600_la_LDFLAGS = $(GALLIUM_OMX_LINKER_FLAGS)
-
-libomx_r600_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_OMX_LIB_DEPS) \
-	$(LIBDRM_LIBS) \
-	$(RADEON_LIBS)
diff --git a/src/gallium/targets/r600/omx/drm_target.c b/src/gallium/targets/r600/omx/drm_target.c
deleted file mode 120000
index 6955421..0000000
--- a/src/gallium/targets/r600/omx/drm_target.c
+++ /dev/null
@@ -1 +0,0 @@
-../common/drm_target.c
\ No newline at end of file
-- 
2.0.0