diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/gallium/Automake.inc | 2 | ||||
| -rw-r--r-- | src/gallium/targets/Makefile.am | 8 | ||||
| -rw-r--r-- | src/gallium/targets/omx-nouveau/Makefile.am | 45 | ||||
| -rw-r--r-- | src/gallium/targets/omx-nouveau/target.c | 18 | ||||
| -rw-r--r-- | src/gallium/targets/omx/Makefile.am | 67 | ||||
| -rw-r--r-- | src/gallium/targets/omx/omx.sym (renamed from src/gallium/targets/omx.sym) | 0 | ||||
| -rw-r--r-- | src/gallium/targets/omx/target.c | 1 |
8 files changed, 76 insertions, 70 deletions
diff --git a/configure.ac b/configure.ac index e4cfb07ee02..51a0b4fd3d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1425,6 +1425,7 @@ AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes) if test "x$enable_omx" = xyes; then PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS omx" + enable_gallium_loader=yes fi AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) @@ -1969,7 +1970,7 @@ if test -n "$with_gallium_drivers"; then PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau" - gallium_check_st "nouveau/drm" "dri-nouveau" "" "xvmc/nouveau" "vdpau/nouveau" "omx-nouveau" + gallium_check_st "nouveau/drm" "dri-nouveau" "" "xvmc/nouveau" "vdpau/nouveau" "omx/nouveau" DRICOMMON_NEED_LIBDRM=yes ;; xfreedreno) @@ -2214,7 +2215,7 @@ AC_CONFIG_FILES([Makefile src/gallium/targets/egl-static/Makefile src/gallium/targets/gbm/Makefile src/gallium/targets/libgl-xlib/Makefile - src/gallium/targets/omx-nouveau/Makefile + src/gallium/targets/omx/Makefile src/gallium/targets/opencl/Makefile src/gallium/targets/osmesa/Makefile src/gallium/targets/osmesa/osmesa.pc diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index 8bf2a12e806..0d5830cb871 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -72,7 +72,7 @@ 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.sym + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx/omx.sym endif diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index e96224eaf35..1af0c446eff 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -26,6 +26,10 @@ if HAVE_X11_DRIVER SUBDIRS += libgl-xlib endif +if HAVE_ST_OMX +SUBDIRS += omx +endif + if HAVE_GALLIUM_OSMESA SUBDIRS += osmesa endif @@ -104,10 +108,6 @@ if HAVE_GALLIUM_NOUVEAU if HAVE_DRI2 SUBDIRS += dri-nouveau endif - -if HAVE_ST_OMX -SUBDIRS += omx-nouveau -endif endif if HAVE_GALLIUM_SOFTPIPE diff --git a/src/gallium/targets/omx-nouveau/Makefile.am b/src/gallium/targets/omx-nouveau/Makefile.am deleted file mode 100644 index 3b2a1a52e13..00000000000 --- a/src/gallium/targets/omx-nouveau/Makefile.am +++ /dev/null @@ -1,45 +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_nouveau.la - -nodist_EXTRA_libomx_nouveau_la_SOURCES = dummy.cpp -libomx_nouveau_la_SOURCES = \ - target.c \ - $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c - -libomx_nouveau_la_LDFLAGS = $(GALLIUM_OMX_LINKER_FLAGS) - -libomx_nouveau_la_LIBADD = \ - $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ - $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ - $(GALLIUM_OMX_LIB_DEPS) \ - $(LIBDRM_LIBS) \ - $(NOUVEAU_LIBS) diff --git a/src/gallium/targets/omx-nouveau/target.c b/src/gallium/targets/omx-nouveau/target.c deleted file mode 100644 index d580b104421..00000000000 --- a/src/gallium/targets/omx-nouveau/target.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" -#include "nouveau/drm/nouveau_drm_public.h" - -static struct pipe_screen *create_screen(int fd) -{ - struct pipe_screen *screen; - - screen = nouveau_drm_screen_create(fd); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen, NULL) diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am new file mode 100644 index 00000000000..cd79a441b72 --- /dev/null +++ b/src/gallium/targets/omx/Makefile.am @@ -0,0 +1,67 @@ +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + $(GALLIUM_VIDEO_CFLAGS) + +omxdir = $(OMX_LIB_INSTALL_DIR) +omx_LTLIBRARIES = libomx_mesa.la + +nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp +libomx_mesa_la_SOURCES = \ + $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c + +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/libgallium.la \ + $(OMX_LIBS) \ + $(GALLIUM_COMMON_LIB_DEPS) + +if HAVE_GALLIUM_STATIC_TARGETS + +STATIC_TARGET_CPPFLAGS = -DGALLIUM_STATIC_TARGETS=1 +STATIC_TARGET_LIB_DEPS = \ + $(top_builddir)/src/loader/libloader.la + +if HAVE_GALLIUM_NOUVEAU +STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ + $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ + $(NOUVEAU_LIBS) +endif + +libomx_mesa_la_SOURCES += target.c +libomx_mesa_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) +libomx_mesa_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) + +else # HAVE_GALLIUM_STATIC_TARGETS + +libomx_mesa_la_CPPFLAGS = \ + $(GALLIUM_PIPE_LOADER_DEFINES) \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" + +# XXX: Use the pipe-loader-client over pipe-loader ? +libomx_mesa_la_LIBADD += \ + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ + $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ + $(GALLIUM_PIPE_LOADER_LIBS) + +endif # HAVE_GALLIUM_STATIC_TARGETS + +if HAVE_MESA_LLVM +libomx_mesa_la_LIBADD += $(LLVM_LIBS) +libomx_mesa_la_LDFLAGS += $(LLVM_LDFLAGS) +endif diff --git a/src/gallium/targets/omx.sym b/src/gallium/targets/omx/omx.sym index af22aedb587..af22aedb587 100644 --- a/src/gallium/targets/omx.sym +++ b/src/gallium/targets/omx/omx.sym diff --git a/src/gallium/targets/omx/target.c b/src/gallium/targets/omx/target.c new file mode 100644 index 00000000000..fde4a4a7dcf --- /dev/null +++ b/src/gallium/targets/omx/target.c @@ -0,0 +1 @@ +#include "target-helpers/inline_drm_helper.h" |