[Mesa-dev] [PATCH v3] egl/dri2: implement platform_surfaceless
Zachary Reizner
zachr at google.com
Wed Jun 10 19:27:42 PDT 2015
Sorry, only remembered to change that to [PATCH v4] two seconds after
pressing send. The commit message mentions v4.
On Wed, Jun 10, 2015 at 7:25 PM, Zach Reizner <zachr at google.com> wrote:
> From: Haixia Shi <hshi at chromium.org>
>
> The surfaceless platform is for off-screen rendering only. Render node
> support
> is required.
>
> Only consider the render nodes. Do not use normal nodes as they require
> auth hooks.
>
> v3: change platform_null to platform_surfaceless
> v4: make libdrm required for surfaceless
>
> Signed-off-by: Haixia Shi <hshi at chromium.org>
> Signed-off-by: Zach Reizner <zachr at google.com>
> ---
> configure.ac | 6 ++
> src/egl/drivers/dri2/Makefile.am | 5 +
> src/egl/drivers/dri2/egl_dri2.c | 11 +-
> src/egl/drivers/dri2/egl_dri2.h | 3 +
> src/egl/drivers/dri2/platform_surfaceless.c | 161
> ++++++++++++++++++++++++++++
> src/egl/main/Makefile.am | 4 +
> src/egl/main/egldisplay.c | 3 +-
> src/egl/main/egldisplay.h | 1 +
> 8 files changed, 191 insertions(+), 3 deletions(-)
> create mode 100644 src/egl/drivers/dri2/platform_surfaceless.c
>
> diff --git a/configure.ac b/configure.ac
> index d32aa24..e7c7f87 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1777,6 +1777,11 @@ for plat in $egl_platforms; do
> AC_MSG_ERROR([EGL platform drm requires libdrm >=
> $LIBDRM_REQUIRED])
> ;;
>
> + surfaceless)
> + test "x$have_libdrm" != xyes &&
> + AC_MSG_ERROR([EGL platform surfaceless requires
> libdrm >= $LIBDRM_REQUIRED])
> + ;;
> +
> android|gdi|null)
> ;;
>
> @@ -1806,6 +1811,7 @@ fi
> AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep -q
> 'x11')
> AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q
> 'wayland')
> AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q
> 'drm')
> +AM_CONDITIONAL(HAVE_EGL_PLATFORM_SURFACELESS, echo "$egl_platforms" |
> grep -q 'surfaceless')
> AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q
> 'null')
>
> AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
> diff --git a/src/egl/drivers/dri2/Makefile.am
> b/src/egl/drivers/dri2/Makefile.am
> index f589600..55be4a7 100644
> --- a/src/egl/drivers/dri2/Makefile.am
> +++ b/src/egl/drivers/dri2/Makefile.am
> @@ -65,4 +65,9 @@ libegl_dri2_la_SOURCES += platform_drm.c
> AM_CFLAGS += -DHAVE_DRM_PLATFORM
> endif
>
> +if HAVE_EGL_PLATFORM_SURFACELESS
> +libegl_dri2_la_SOURCES += platform_surfaceless.c
> +AM_CFLAGS += -DHAVE_SURFACELESS_PLATFORM
> +endif
> +
> EXTRA_DIST = SConscript
> diff --git a/src/egl/drivers/dri2/egl_dri2.c
> b/src/egl/drivers/dri2/egl_dri2.c
> index 82f8843..877cf70 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -658,6 +658,13 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp)
> return EGL_FALSE;
>
> switch (disp->Platform) {
> +#ifdef HAVE_SURFACELESS_PLATFORM
> + case _EGL_PLATFORM_SURFACELESS:
> + if (disp->Options.TestOnly)
> + return EGL_TRUE;
> + return dri2_initialize_surfaceless(drv, disp);
> +#endif
> +
> #ifdef HAVE_X11_PLATFORM
> case _EGL_PLATFORM_X11:
> if (disp->Options.TestOnly)
> @@ -1604,7 +1611,7 @@ dri2_create_wayland_buffer_from_image(_EGLDriver
> *drv, _EGLDisplay *dpy,
> return dri2_dpy->vtbl->create_wayland_buffer_from_image(drv, dpy, img);
> }
>
> -#ifdef HAVE_LIBDRM
> +#if defined(HAVE_DRM_PLATFORM) || defined(HAVE_SURFACELESS_PLATFORM)
> static EGLBoolean
> dri2_check_dma_buf_attribs(const _EGLImageAttribs *attrs)
> {
> @@ -1862,7 +1869,7 @@ dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay
> *disp,
> case EGL_WAYLAND_BUFFER_WL:
> return dri2_create_image_wayland_wl_buffer(disp, ctx, buffer,
> attr_list);
> #endif
> -#ifdef HAVE_LIBDRM
> +#if defined(HAVE_DRM_PLATFORM) || defined(HAVE_SURFACELESS_PLATFORM)
> case EGL_LINUX_DMA_BUF_EXT:
> return dri2_create_image_dma_buf(disp, ctx, buffer, attr_list);
> #endif
> diff --git a/src/egl/drivers/dri2/egl_dri2.h
> b/src/egl/drivers/dri2/egl_dri2.h
> index adade3d..9985c49 100644
> --- a/src/egl/drivers/dri2/egl_dri2.h
> +++ b/src/egl/drivers/dri2/egl_dri2.h
> @@ -351,6 +351,9 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay
> *disp);
> EGLBoolean
> dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp);
>
> +EGLBoolean
> +dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp);
> +
> void
> dri2_flush_drawable_for_swapbuffers(_EGLDisplay *disp, _EGLSurface *draw);
>
> diff --git a/src/egl/drivers/dri2/platform_surfaceless.c
> b/src/egl/drivers/dri2/platform_surfaceless.c
> new file mode 100644
> index 0000000..f8426bb
> --- /dev/null
> +++ b/src/egl/drivers/dri2/platform_surfaceless.c
> @@ -0,0 +1,161 @@
> +/*
> + * Mesa 3-D graphics library
> + *
> + * Copyright (c) 2014 The Chromium OS Authors.
> + * Copyright © 2011 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 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 <stdlib.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <xf86drm.h>
> +#include <dlfcn.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <fcntl.h>
> +#include <unistd.h>
> +
> +#include "egl_dri2.h"
> +#include "egl_dri2_fallbacks.h"
> +#include "loader.h"
> +
> +static struct dri2_egl_display_vtbl dri2_surfaceless_display_vtbl = {
> + .create_pixmap_surface = dri2_fallback_create_pixmap_surface,
> + .create_image = dri2_create_image_khr,
> + .swap_interval = dri2_fallback_swap_interval,
> + .swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage,
> + .swap_buffers_region = dri2_fallback_swap_buffers_region,
> + .post_sub_buffer = dri2_fallback_post_sub_buffer,
> + .copy_buffers = dri2_fallback_copy_buffers,
> + .query_buffer_age = dri2_fallback_query_buffer_age,
> + .create_wayland_buffer_from_image =
> dri2_fallback_create_wayland_buffer_from_image,
> + .get_sync_values = dri2_fallback_get_sync_values,
> +};
> +
> +static void
> +surfaceless_flush_front_buffer(__DRIdrawable *driDrawable, void
> *loaderPrivate)
> +{
> +}
> +
> +static __DRIbuffer *
> +surfaceless_get_buffers_with_format(__DRIdrawable * driDrawable,
> + int *width, int *height,
> + unsigned int *attachments, int count,
> + int *out_count, void *loaderPrivate)
> +{
> + struct dri2_egl_surface *dri2_surf = loaderPrivate;
> +
> + dri2_surf->buffer_count = 1;
> + if (width)
> + *width = dri2_surf->base.Width;
> + if (height)
> + *height = dri2_surf->base.Height;
> + *out_count = dri2_surf->buffer_count;;
> + return dri2_surf->buffers;
> +}
> +
> +#define DRM_RENDER_DEV_NAME "%s/renderD%d"
> +
> +EGLBoolean
> +dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp)
> +{
> + struct dri2_egl_display *dri2_dpy;
> + const char* err;
> + int i;
> + int driver_loaded = 0;
> +
> + loader_set_logger(_eglLog);
> +
> + dri2_dpy = calloc(1, sizeof *dri2_dpy);
> + if (!dri2_dpy)
> + return _eglError(EGL_BAD_ALLOC, "eglInitialize");
> +
> + disp->DriverData = (void *) dri2_dpy;
> +
> + const int limit = 64;
> + const int base = 128;
> + for (i = 0; i < limit; ++i) {
> + char *card_path;
> + if (asprintf(&card_path, DRM_RENDER_DEV_NAME, DRM_DIR_NAME, base +
> i) < 0)
> + continue;
> +
> + dri2_dpy->fd = open(card_path, O_RDWR);
> + free(card_path);
> + if (dri2_dpy->fd < 0)
> + continue;
> +
> + dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd, 0);
> + if (dri2_dpy->driver_name) {
> + if (dri2_load_driver(disp)) {
> + driver_loaded = 1;
> + break;
> + }
> + free(dri2_dpy->driver_name);
> + }
> + close(dri2_dpy->fd);
> + }
> +
> + if (!driver_loaded) {
> + err = "DRI2: failed to load driver";
> + goto cleanup_display;
> + }
> +
> + dri2_dpy->dri2_loader_extension.base.name = __DRI_DRI2_LOADER;
> + dri2_dpy->dri2_loader_extension.base.version = 3;
> + dri2_dpy->dri2_loader_extension.getBuffers = NULL;
> + dri2_dpy->dri2_loader_extension.flushFrontBuffer =
> + surfaceless_flush_front_buffer;
> + dri2_dpy->dri2_loader_extension.getBuffersWithFormat =
> + surfaceless_get_buffers_with_format;
> +
> + dri2_dpy->extensions[0] = &dri2_dpy->dri2_loader_extension.base;
> + dri2_dpy->extensions[1] = &image_lookup_extension.base;
> + dri2_dpy->extensions[2] = &use_invalidate.base;
> + dri2_dpy->extensions[3] = NULL;
> +
> + if (!dri2_create_screen(disp)) {
> + err = "DRI2: failed to create screen";
> + goto cleanup_driver;
> + }
> +
> + for (i = 0; dri2_dpy->driver_configs[i]; i++) {
> + dri2_add_config(disp, dri2_dpy->driver_configs[i],
> + i + 1, EGL_WINDOW_BIT, NULL, NULL);
> + }
> +
> + disp->Extensions.KHR_image_base = EGL_TRUE;
> +
> + /* Fill vtbl last to prevent accidentally calling virtual function
> during
> + * initialization.
> + */
> + dri2_dpy->vtbl = &dri2_surfaceless_display_vtbl;
> +
> + return EGL_TRUE;
> +
> +cleanup_driver:
> + dlclose(dri2_dpy->driver);
> + free(dri2_dpy->driver_name);
> + close(dri2_dpy->fd);
> +cleanup_display:
> + free(dri2_dpy);
> +
> + return _eglError(EGL_NOT_INITIALIZED, err);
> +}
> diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
> index b661736..9030d27 100644
> --- a/src/egl/main/Makefile.am
> +++ b/src/egl/main/Makefile.am
> @@ -68,6 +68,10 @@ if HAVE_EGL_PLATFORM_NULL
> AM_CFLAGS += -DHAVE_NULL_PLATFORM
> endif
>
> +if HAVE_EGL_PLATFORM_SURFACELESS
> +AM_CFLAGS += -DHAVE_SURFACELESS_PLATFORM
> +endif
> +
> if HAVE_EGL_DRIVER_DRI2
> AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
> AM_CFLAGS += -DHAVE_XCB_DRI2
> diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
> index a3ecba8..24a0c7e 100644
> --- a/src/egl/main/egldisplay.c
> +++ b/src/egl/main/egldisplay.c
> @@ -71,7 +71,8 @@ static const struct {
> { _EGL_PLATFORM_DRM, "drm" },
> { _EGL_PLATFORM_NULL, "null" },
> { _EGL_PLATFORM_ANDROID, "android" },
> - { _EGL_PLATFORM_HAIKU, "haiku" }
> + { _EGL_PLATFORM_HAIKU, "haiku" },
> + { _EGL_PLATFORM_SURFACELESS, "surfaceless" },
> };
>
>
> diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
> index 84cfbe1..0b50a36 100644
> --- a/src/egl/main/egldisplay.h
> +++ b/src/egl/main/egldisplay.h
> @@ -51,6 +51,7 @@ enum _egl_platform_type {
> _EGL_PLATFORM_NULL,
> _EGL_PLATFORM_ANDROID,
> _EGL_PLATFORM_HAIKU,
> + _EGL_PLATFORM_SURFACELESS,
>
> _EGL_NUM_PLATFORMS,
> _EGL_INVALID_PLATFORM = -1
> --
> 2.2.0.rc0.207.ga3a616c
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150610/2f831b31/attachment-0001.html>
More information about the mesa-dev
mailing list