From 6a8aa11c207b99920b9306b209f071a0e3fe8b43 Mon Sep 17 00:00:00 2001 From: Gurkirpal Singh Date: Sat, 12 Aug 2017 21:37:15 +0530 Subject: st/omx_bellagio: Rename state tracker and option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes --enable-omx option to --enable-omx-bellagio Signed-off-by: Gurkirpal Singh Reviewed-and-Tested-by: Julien Isorce Acked-by: Christian König --- src/gallium/targets/omx-bellagio/Makefile.am | 75 ++++++++++++++++++++++++++++ src/gallium/targets/omx-bellagio/omx.sym | 11 ++++ src/gallium/targets/omx-bellagio/target.c | 2 + src/gallium/targets/omx/Makefile.am | 75 ---------------------------- src/gallium/targets/omx/omx.sym | 11 ---- src/gallium/targets/omx/target.c | 2 - 6 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 src/gallium/targets/omx-bellagio/Makefile.am create mode 100644 src/gallium/targets/omx-bellagio/omx.sym create mode 100644 src/gallium/targets/omx-bellagio/target.c delete mode 100644 src/gallium/targets/omx/Makefile.am delete mode 100644 src/gallium/targets/omx/omx.sym delete mode 100644 src/gallium/targets/omx/target.c (limited to 'src/gallium/targets') diff --git a/src/gallium/targets/omx-bellagio/Makefile.am b/src/gallium/targets/omx-bellagio/Makefile.am new file mode 100644 index 00000000000..4c9a12c3c74 --- /dev/null +++ b/src/gallium/targets/omx-bellagio/Makefile.am @@ -0,0 +1,75 @@ +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + $(GALLIUM_TARGET_CFLAGS) + +omxdir = $(OMX_BELLAGIO_LIB_INSTALL_DIR) +omx_LTLIBRARIES = libomx_mesa.la + +nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp +libomx_mesa_la_SOURCES = + +libomx_mesa_la_LDFLAGS = \ + -shared \ + -module \ + -no-undefined \ + -avoid-version \ + $(GC_SECTIONS) \ + $(LD_NO_UNDEFINED) + +if HAVE_LD_VERSION_SCRIPT +libomx_mesa_la_LDFLAGS += \ + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx-bellagio/omx.sym +endif # HAVE_LD_VERSION_SCRIPT + +libomx_mesa_la_LIBADD = \ + $(top_builddir)/src/gallium/state_trackers/omx_bellagio/libomxtracker.la \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(OMX_BELLAGIO_LIBS) \ + $(LIBDRM_LIBS) \ + $(GALLIUM_COMMON_LIB_DEPS) + +if HAVE_PLATFORM_X11 +libomx_mesa_la_LIBADD += \ + $(VL_LIBS) \ + $(XCB_DRI3_LIBS) +endif + +EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym +EXTRA_DIST = omx.sym + +if HAVE_GALLIUM_STATIC_TARGETS + +TARGET_DRIVERS = +TARGET_CPPFLAGS = +TARGET_LIB_DEPS = + + +include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc + +include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc +include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc + +libomx_mesa_la_SOURCES += target.c +libomx_mesa_la_CPPFLAGS = $(TARGET_CPPFLAGS) +libomx_mesa_la_LIBADD += \ + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ + $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ + $(TARGET_LIB_DEPS) \ + $(TARGET_COMPILER_LIB_DEPS) \ + $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) + +else # HAVE_GALLIUM_STATIC_TARGETS + +libomx_mesa_la_LIBADD += \ + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la + +endif # HAVE_GALLIUM_STATIC_TARGETS + +if HAVE_GALLIUM_LLVM +libomx_mesa_la_LIBADD += $(LLVM_LIBS) +libomx_mesa_la_LDFLAGS += $(LLVM_LDFLAGS) +endif diff --git a/src/gallium/targets/omx-bellagio/omx.sym b/src/gallium/targets/omx-bellagio/omx.sym new file mode 100644 index 00000000000..e8a287600a5 --- /dev/null +++ b/src/gallium/targets/omx-bellagio/omx.sym @@ -0,0 +1,11 @@ +{ + global: + omx_component_library_Setup; + + # Workaround for an LLVM warning with -simplifycfg-sink-common + # due to LLVM being initialized multiple times. + radeon_drm_winsys_create; + amdgpu_winsys_create; + local: + *; +}; diff --git a/src/gallium/targets/omx-bellagio/target.c b/src/gallium/targets/omx-bellagio/target.c new file mode 100644 index 00000000000..308e23bb4a0 --- /dev/null +++ b/src/gallium/targets/omx-bellagio/target.c @@ -0,0 +1,2 @@ +#include "target-helpers/drm_helper.h" +#include "target-helpers/sw_helper.h" diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am deleted file mode 100644 index d977255fcfc..00000000000 --- a/src/gallium/targets/omx/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_TARGET_CFLAGS) - -omxdir = $(OMX_LIB_INSTALL_DIR) -omx_LTLIBRARIES = libomx_mesa.la - -nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp -libomx_mesa_la_SOURCES = - -libomx_mesa_la_LDFLAGS = \ - -shared \ - -module \ - -no-undefined \ - -avoid-version \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -libomx_mesa_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx/omx.sym -endif # HAVE_LD_VERSION_SCRIPT - -libomx_mesa_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(OMX_LIBS) \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -if HAVE_PLATFORM_X11 -libomx_mesa_la_LIBADD += \ - $(VL_LIBS) \ - $(XCB_DRI3_LIBS) -endif - -EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym -EXTRA_DIST = omx.sym - -if HAVE_GALLIUM_STATIC_TARGETS - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = - - -include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc -include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc - -libomx_mesa_la_SOURCES += target.c -libomx_mesa_la_CPPFLAGS = $(TARGET_CPPFLAGS) -libomx_mesa_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(TARGET_LIB_DEPS) \ - $(TARGET_COMPILER_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS - -libomx_mesa_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_GALLIUM_LLVM -libomx_mesa_la_LIBADD += $(LLVM_LIBS) -libomx_mesa_la_LDFLAGS += $(LLVM_LDFLAGS) -endif diff --git a/src/gallium/targets/omx/omx.sym b/src/gallium/targets/omx/omx.sym deleted file mode 100644 index e8a287600a5..00000000000 --- a/src/gallium/targets/omx/omx.sym +++ /dev/null @@ -1,11 +0,0 @@ -{ - global: - omx_component_library_Setup; - - # Workaround for an LLVM warning with -simplifycfg-sink-common - # due to LLVM being initialized multiple times. - radeon_drm_winsys_create; - amdgpu_winsys_create; - local: - *; -}; diff --git a/src/gallium/targets/omx/target.c b/src/gallium/targets/omx/target.c deleted file mode 100644 index 308e23bb4a0..00000000000 --- a/src/gallium/targets/omx/target.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "target-helpers/drm_helper.h" -#include "target-helpers/sw_helper.h" -- cgit v1.2.3