From 1c6154c9b457acca6ccd51ab56b2ad589e7f622a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 5 Apr 2014 02:15:33 +0100 Subject: [PATCH] targets/omx: add nouveau target Signed-off-by: Emil Velikov --- configure.ac | 3 +- src/gallium/targets/Makefile.am | 4 ++ src/gallium/targets/omx-nouveau/Makefile.am | 43 +++++++++++++++++++++ src/gallium/targets/omx-nouveau/target.c | 18 +++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 src/gallium/targets/omx-nouveau/Makefile.am create mode 100644 src/gallium/targets/omx-nouveau/target.c diff --git a/configure.ac b/configure.ac index bf543c2d0d6..7251a5b3e43 100644 --- a/configure.ac +++ b/configure.ac @@ -1843,7 +1843,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" + gallium_check_st "nouveau/drm" "dri-nouveau" "" "xvmc-nouveau" "vdpau-nouveau" "omx-nouveau" DRICOMMON_NEED_LIBDRM=yes ;; xfreedreno) @@ -2086,6 +2086,7 @@ AC_CONFIG_FILES([Makefile src/gallium/targets/opencl/Makefile src/gallium/targets/xa/Makefile src/gallium/targets/xa/xatracker.pc + src/gallium/targets/omx-nouveau/Makefile src/gallium/targets/osmesa/Makefile src/gallium/targets/osmesa/osmesa.pc src/gallium/targets/pipe-loader/Makefile diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index 871b31d9512..5023dbc3bff 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -116,6 +116,10 @@ endif if HAVE_ST_VDPAU SUBDIRS += vdpau-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 new file mode 100644 index 00000000000..40ae06ca859 --- /dev/null +++ b/src/gallium/targets/omx-nouveau/Makefile.am @@ -0,0 +1,43 @@ +# 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_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 new file mode 100644 index 00000000000..d580b104421 --- /dev/null +++ b/src/gallium/targets/omx-nouveau/target.c @@ -0,0 +1,18 @@ +#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) -- 2.30.2