diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0009-compositor-Process-stream-attach-requests-with-wl_eg.patch | 446 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
3 files changed, 455 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = weston-eglstream pkgdesc = Reference implementation of a Wayland compositor with EGLStream support pkgver = 2.0.0 - pkgrel = 2 + pkgrel = 3 url = https://wayland.freedesktop.org/ arch = i686 arch = x86_64 @@ -43,6 +43,7 @@ pkgbase = weston-eglstream source = 0006-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch source = 0007-Add-nvidia-release-notes-file.patch source = 0008-compositor-drm-Release-current-next-fb-when-deactiva.patch + source = 0009-compositor-Process-stream-attach-requests-with-wl_eg.patch sha256sums = b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8 sha256sums = c81d07f0a2b26e772faa02e4b088ff979206216652a4c30beb9aa24631d9d648 sha256sums = c32048c7b1e57c24ca7fa665c9e70bc3c12dec338aea3643b637bf8d30188335 @@ -52,6 +53,7 @@ pkgbase = weston-eglstream sha256sums = 3bb9b0a354aa07fb3eb89ad9b7e425b1ce980b1bd0b90166a41795a80acc78ca sha256sums = 47fc9f44083096299e1502cf15c93d9f8670e1a4e4784870d7a843d4de09d502 sha256sums = ca6c3a6fef381c6c7dd05e6d1bfda97b221fd90fc78ebf7b7ade9cfad2b38b63 + sha256sums = d9f0bb2ac862017d0a1f0bddd3fedb5d4e7be3b5af6dd579d75442f9f88acf63 pkgname = weston-eglstream diff --git a/0009-compositor-Process-stream-attach-requests-with-wl_eg.patch b/0009-compositor-Process-stream-attach-requests-with-wl_eg.patch new file mode 100644 index 000000000000..46ec4d03fb85 --- /dev/null +++ b/0009-compositor-Process-stream-attach-requests-with-wl_eg.patch @@ -0,0 +1,446 @@ +From 0c3c2b77d486f90e19bd6fcfdefc42b143e40b1d Mon Sep 17 00:00:00 2001 +From: "Miguel A. Vico" <mvicomoya@nvidia.com> +Date: Thu, 18 May 2017 14:35:36 -0700 +Subject: [PATCH] compositor: Process stream attach requests with + wl_eglstream_controller +X-NVConfidentiality: public + +So far, the EGLStream implementation of the Wayland client-side driver +has been using wl_surface_attach + commit in order to make the server +create its stream endpoint and attach a consumer to it. + +However, no actual buffer would be actually shared between client and +server, which goes against many of the assumptions behind +wl_surface_attach + commit. + +This has caused different interaction issues in the past. + +In order to properly resolve this once and for all, a new +wl_eglstream_controller protocol has been added which will let clients +request the compositor to create its stream. + +This change adds the required code for weston to create a +wl_eglstream_controller global and process attach_eglstream_consumer +requests. + +[mvicomoya: - Dynamically load libnvidia-egl-wayland.so.1 instead linking + against it + - add a copy of wayland-eglstream-controller protocol, and + generate the server header at build time] + +Signed-off-by: Ashutosh Agarwal <asagarwal@nvidia.com> +Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com> +--- + Makefile.am | 5 ++ + Makefile.in | 4 + + libweston/compositor.c | 78 ++++++++++++++++ + libweston/compositor.h | 4 + + libweston/gl-renderer.c | 145 +++++++++++++++++++----------- + protocol/wayland-eglstream-controller.xml | 37 ++++++++ + 6 files changed, 219 insertions(+), 54 deletions(-) + create mode 100644 protocol/wayland-eglstream-controller.xml + +diff --git a/Makefile.am b/Makefile.am +index cdf82ab4..6b706c96 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -182,6 +182,11 @@ nodist_libweston_@LIBWESTON_MAJOR@_la_SOURCES = \ + + BUILT_SOURCES += $(nodist_libweston_@LIBWESTON_MAJOR@_la_SOURCES) + ++nodist_libweston_eglstreams_@LIBWESTON_MAJOR@_la_SOURCES = \ ++ protocol/wayland-eglstream-controller-server-protocol.h ++ ++BUILT_SOURCES += $(nodist_libweston_eglstreams_@LIBWESTON_MAJOR@_la_SOURCES) ++ + bin_PROGRAMS += weston + + weston_LDFLAGS = -export-dynamic +diff --git a/Makefile.in b/Makefile.in +index 0202bfb..4de3f53 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -2107,6 +2107,7 @@ noinst_LTLIBRARIES = libsession-helper.la $(am__append_31) \ + BUILT_SOURCES = \ + $(nodist_libweston_desktop_@LIBWESTON_MAJOR@_la_SOURCES) \ + $(nodist_libweston_@LIBWESTON_MAJOR@_la_SOURCES) \ ++ $(nodist_libweston_eglstreams_@LIBWESTON_MAJOR@_la_SOURCES) \ + $(am__append_28) $(am__append_30) $(am__append_32) \ + protocol/weston-screenshooter-protocol.c \ + protocol/weston-screenshooter-client-protocol.h \ +@@ -2270,6 +2271,9 @@ nodist_libweston_@LIBWESTON_MAJOR@_la_SOURCES = \ + protocol/pointer-constraints-unstable-v1-protocol.c \ + protocol/pointer-constraints-unstable-v1-server-protocol.h + ++nodist_libweston_eglstreams_@LIBWESTON_MAJOR@_la_SOURCES = \ ++ protocol/wayland-eglstream-controller-server-protocol.h ++ + weston_LDFLAGS = -export-dynamic + weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON \ + -DMODULEDIR='"$(moduledir)"' \ +diff --git a/libweston/compositor.c b/libweston/compositor.c +index 9ded23f3..ecc0f841 100644 +--- a/libweston/compositor.c ++++ b/libweston/compositor.c +@@ -2,6 +2,7 @@ + * Copyright © 2010-2011 Intel Corporation + * Copyright © 2008-2011 Kristian Høgsberg + * Copyright © 2012-2015 Collabora, Ltd. ++ * Copyright © 2017 NVIDIA Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the +@@ -63,6 +64,7 @@ + #include "git-version.h" + #include "version.h" + #include "plugin-registry.h" ++#include "wayland-eglstream-controller-server-protocol.h" + + #define DEFAULT_REPAINT_WINDOW 7 /* milliseconds */ + +@@ -4991,6 +4993,80 @@ bind_presentation(struct wl_client *client, + wp_presentation_send_clock_id(resource, compositor->presentation_clock); + } + ++static struct wl_interface *eglstream_controller_interface = NULL; ++ ++static void ++attach_eglstream_consumer(struct wl_client *client, ++ struct wl_resource *resource, ++ struct wl_resource *wl_surface, ++ struct wl_resource *wl_eglstream) ++{ ++ struct weston_surface *surface = ++ wl_resource_get_user_data(wl_surface); ++ ++ surface->compositor->renderer->attach_eglstream_consumer(surface, ++ wl_eglstream); ++} ++ ++static const struct wl_eglstream_controller_interface ++eglstream_controller_implementation = { ++ attach_eglstream_consumer ++}; ++ ++static void ++bind_eglstream_controller(struct wl_client *client, ++ void *data, uint32_t version, uint32_t id) ++{ ++ struct wl_resource *resource; ++ ++ resource = wl_resource_create(client, eglstream_controller_interface, ++ version, id); ++ ++ if (resource == NULL) { ++ wl_client_post_no_memory(client); ++ return; ++ } ++ wl_resource_set_implementation(resource, ++ &eglstream_controller_implementation, ++ data, ++ NULL); ++} ++ ++static void ++init_eglstream_controller(struct wl_display *display) ++{ ++ /* ++ * wl_eglstream_controller_interface is provided by ++ * libnvidia-egl-wayland.so.1 ++ * ++ * Since it might not be available on the ++ * system, dynamically load it at runtime and resolve the needed ++ * symbols. If available, it should be found under any of the search ++ * directories of dlopen() ++ * ++ * Failure to initialize wl_eglstream_controller is non-fatal ++ */ ++ ++ void *lib = dlopen("libnvidia-egl-wayland.so.1", RTLD_NOW | RTLD_LAZY); ++ if (!lib) ++ goto fail; ++ ++ eglstream_controller_interface = ++ dlsym(lib, "wl_eglstream_controller_interface"); ++ ++ if (!eglstream_controller_interface) ++ goto fail; ++ ++ if (wl_global_create(display, ++ eglstream_controller_interface, 1, ++ NULL, bind_eglstream_controller)) ++ return; /* success */ ++fail: ++ if (lib) ++ dlclose(lib); ++ weston_log("warning: Unable to initialize wl_eglstream_controller.\n"); ++} ++ + static void + compositor_bind(struct wl_client *client, + void *data, uint32_t version, uint32_t id) +@@ -5102,6 +5178,8 @@ weston_compositor_create(struct wl_display *display, void *user_data) + ec, bind_presentation)) + goto fail; + ++ init_eglstream_controller(ec->wl_display); ++ + if (weston_input_init(ec) != 0) + goto fail; + +diff --git a/libweston/compositor.h b/libweston/compositor.h +index 08e728a9..a9105534 100644 +--- a/libweston/compositor.h ++++ b/libweston/compositor.h +@@ -732,6 +732,10 @@ struct weston_renderer { + /** See weston_compositor_import_dmabuf() */ + bool (*import_dmabuf)(struct weston_compositor *ec, + struct linux_dmabuf_buffer *buffer); ++ ++ /** Create weston endpoint of an EGLStream & attach a consumer to it */ ++ bool (*attach_eglstream_consumer)(struct weston_surface *es, ++ struct wl_resource *wl_eglstream); + }; + + enum weston_capability { +diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c +index 6bcfe40f..34f7842f 100644 +--- a/libweston/gl-renderer.c ++++ b/libweston/gl-renderer.c +@@ -1,7 +1,7 @@ + /* + * Copyright © 2012 Intel Corporation + * Copyright © 2015 Collabora, Ltd. +- * Copyright © 2016 NVIDIA Corporation ++ * Copyright © 2016-2017 NVIDIA Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the +@@ -2059,18 +2059,9 @@ gl_renderer_attach_dmabuf(struct weston_surface *surface, + gs->y_inverted = buffer->y_inverted; + } + +-/* +- * gl_renderer_attach_stream_texture +- * +- * Try to bind given <buffer> to an EGLStream. If the given buffer was already +- * bound, it will acquire next frame on the stream. +- * +- * Return true if the given <buffer> corresponds to an EGLStream; otherwise, +- * return false (if might be another kind of buffer). +- */ +-static bool +-gl_renderer_attach_stream_texture(struct weston_surface *es, +- struct weston_buffer *buffer) ++static EGLint ++gl_renderer_attach_eglstream_consumer_common(struct weston_surface *es, ++ struct wl_resource *wl_eglstream) + { + #ifdef EGL_NV_stream_attrib + struct weston_compositor *ec = es->compositor; +@@ -2079,65 +2070,109 @@ gl_renderer_attach_stream_texture(struct weston_surface *es, + EGLStreamKHR stream = EGL_NO_STREAM_KHR; + EGLAttrib stream_attribs[] = { + #ifdef EGL_WL_wayland_eglstream +- EGL_WAYLAND_EGLSTREAM_WL, (EGLAttrib)buffer->resource, ++ EGL_WAYLAND_EGLSTREAM_WL, (EGLAttrib)wl_eglstream, + #endif + EGL_NONE + }; +- EGLint stream_state = EGL_STREAM_STATE_EMPTY_KHR; + + /* Check for required extensions. If they arent supported, there's no +- * way the given buffer corresponds to an EGLStream */ ++ * way the given resource corresponds to an EGLStream */ + if (!gr->has_egl_stream_attrib || + !gr->has_egl_stream_consumer_gltexture || + !gr->has_egl_wayland_eglstream) +- return false; ++ return EGL_BAD_ACCESS; + + stream = gr->create_stream_attrib(gr->egl_display, stream_attribs); +- if (stream == EGL_NO_STREAM_KHR) { ++ ++ if (stream == EGL_NO_STREAM_KHR) ++ return eglGetError(); ++ ++ if (gs->egl_stream != EGL_NO_STREAM_KHR) ++ gr->destroy_stream(gr->egl_display, gs->egl_stream); ++ ++ gs->egl_stream = stream; ++ gs->shader = &gr->texture_shader_egl_external; ++ gs->target = GL_TEXTURE_EXTERNAL_OES; ++ ++ glActiveTexture(GL_TEXTURE0); ++ ensure_textures(gs, 2); ++ glBindTexture(gs->target, gs->textures[1]); ++ ++ gs->new_stream = (gr->stream_consumer_gltexture( ++ gr->egl_display, ++ gs->egl_stream) == EGL_TRUE); ++ ++ if (!gs->new_stream) { + EGLint err = eglGetError(); + +- switch (err) { +- case EGL_BAD_ACCESS: +- /* EGL_BAD_ACCESS is generated whenever buffer->resource +- * does not corresponds to a stream */ +- return false; ++ weston_log("failed to set stream consumer\n"); ++ weston_log("EGL error state: %s (0x%04lx)\n", ++ egl_error_string(err), (long)err); + +- case EGL_BAD_STREAM_KHR: +- /* EGL_BAD_STREAM_KHR is generated whenever +- * buffer->resource corresponds to a previously created +- * stream so we must have a valid stream handle already +- * we can use to acquire next frame */ +- break; ++ gr->destroy_stream(gr->egl_display, gs->egl_stream); ++ gs->egl_stream = EGL_NO_STREAM_KHR; ++ return err; ++ } + +- default: +- /* An unknown error was generated */ +- assert(0); +- return false; +- } +- } else { +- /* Clean up current stream resources if needed */ +- if (gs->egl_stream != EGL_NO_STREAM_KHR) +- gr->destroy_stream(gr->egl_display, gs->egl_stream); ++ return EGL_SUCCESS; ++#endif ++} + +- gs->egl_stream = stream; +- gs->shader = &gr->texture_shader_egl_external; +- gs->target = GL_TEXTURE_EXTERNAL_OES; ++static bool ++gl_renderer_attach_eglstream_consumer(struct weston_surface *es, ++ struct wl_resource *stream) ++{ ++ EGLint err = gl_renderer_attach_eglstream_consumer_common(es, stream); ++ return (err == EGL_SUCCESS); ++} ++ ++/* ++ * gl_renderer_attach_stream_texture ++ * ++ * Try to bind given <buffer> to an EGLStream. If the given buffer was already ++ * bound, it will acquire next frame on the stream. ++ * ++ * Return true if the given <buffer> corresponds to an EGLStream; otherwise, ++ * return false (if might be another kind of buffer). ++ */ ++static bool ++gl_renderer_attach_stream_texture(struct weston_surface *es, ++ struct weston_buffer *buffer) ++{ ++#ifdef EGL_NV_stream_attrib ++ struct weston_compositor *ec = es->compositor; ++ struct gl_renderer *gr = get_renderer(ec); ++ struct gl_surface_state *gs = get_surface_state(es); ++ EGLint stream_state = EGL_STREAM_STATE_EMPTY_KHR; + +- glActiveTexture(GL_TEXTURE0); +- ensure_textures(gs, 2); +- glBindTexture(gs->target, gs->textures[1]); ++ EGLint err; + +- gs->new_stream = (gr->stream_consumer_gltexture( +- gr->egl_display, +- gs->egl_stream) == EGL_TRUE); ++ err = gl_renderer_attach_eglstream_consumer_common(es, buffer->resource); + +- if (!gs->new_stream) { +- weston_log("failed to set stream consumer\n"); +- gl_renderer_print_egl_error_state(); +- gr->destroy_stream(gr->egl_display, gs->egl_stream); +- gs->egl_stream = EGL_NO_STREAM_KHR; +- return true; /* buffer->resource is EGLStream */ +- } ++ switch (err) { ++ case EGL_BAD_ACCESS: ++ /* EGL_BAD_ACCESS is generated whenever buffer->resource ++ * does not corresponds to a stream */ ++ return false; ++ ++ case EGL_BAD_STREAM_KHR: ++ /* EGL_BAD_STREAM_KHR is generated whenever ++ * buffer->resource corresponds to a previously created ++ * stream so we must have a valid stream handle already ++ * we can use to acquire next frame */ ++ break; ++ ++ case EGL_SUCCESS: ++ /* EGL_SUCCESS is returned when the server stream endpoint is ++ * created and a consumer is attached successfully. This path is ++ * hit with old drivers which use wl_surface::attach + commit to ++ * request stream creation. */ ++ return true; /* buffer->resource is EGLStream */ ++ ++ default: ++ /* An unknown error was generated */ ++ assert(0); ++ return false; + } + + /* At this point we should have a valid stream handle */ +@@ -3485,6 +3520,8 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, + gr->base.surface_get_content_size = + gl_renderer_surface_get_content_size; + gr->base.surface_copy_content = gl_renderer_surface_copy_content; ++ gr->base.attach_eglstream_consumer = ++ gl_renderer_attach_eglstream_consumer; + gr->egl_display = NULL; + + /* extension_suffix is supported */ +diff --git a/protocol/wayland-eglstream-controller.xml b/protocol/wayland-eglstream-controller.xml +new file mode 100644 +index 00000000..dea072e6 +--- /dev/null ++++ b/protocol/wayland-eglstream-controller.xml +@@ -0,0 +1,37 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<protocol name="wl_eglstream_controller"> ++ <copyright> ++ Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. ++ ++ 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. ++ </copyright> ++ <interface name="wl_eglstream_controller" version="1"> ++ <request name="attach_eglstream_consumer"> ++ <description summary="Create server stream and attach consumer"> ++ Creates the corresponding server side EGLStream from the given wl_buffer ++ and attaches a consumer to it. ++ </description> ++ <arg name="wl_surface" type="object" interface="wl_surface" ++ summary="wl_surface corresponds to the client surface associated with ++ newly created eglstream"/> ++ <arg name="wl_resource" type="object" interface="wl_buffer" ++ summary="wl_resource corresponding to an EGLStream"/> ++ </request> ++ </interface> ++</protocol> +-- +2.12.2 + @@ -5,7 +5,7 @@ pkgname=weston-eglstream pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='Reference implementation of a Wayland compositor with EGLStream support' arch=('i686' 'x86_64') url='https://wayland.freedesktop.org/' @@ -25,7 +25,8 @@ source=("https://wayland.freedesktop.org/releases/weston-$pkgver.tar.xz" '0005-compositor-drm-Add-support-for-EGLDevice-EGLOutput.patch' '0006-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch' '0007-Add-nvidia-release-notes-file.patch' - '0008-compositor-drm-Release-current-next-fb-when-deactiva.patch') + '0008-compositor-drm-Release-current-next-fb-when-deactiva.patch' + '0009-compositor-Process-stream-attach-requests-with-wl_eg.patch') sha256sums=('b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8' 'c81d07f0a2b26e772faa02e4b088ff979206216652a4c30beb9aa24631d9d648' 'c32048c7b1e57c24ca7fa665c9e70bc3c12dec338aea3643b637bf8d30188335' @@ -34,7 +35,8 @@ sha256sums=('b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8' '8087849a01853e5c69fad7c9821e2202fd78ffe904626fe2f9ff51e83816ed02' '3bb9b0a354aa07fb3eb89ad9b7e425b1ce980b1bd0b90166a41795a80acc78ca' '47fc9f44083096299e1502cf15c93d9f8670e1a4e4784870d7a843d4de09d502' - 'ca6c3a6fef381c6c7dd05e6d1bfda97b221fd90fc78ebf7b7ade9cfad2b38b63') + 'ca6c3a6fef381c6c7dd05e6d1bfda97b221fd90fc78ebf7b7ade9cfad2b38b63' + 'd9f0bb2ac862017d0a1f0bddd3fedb5d4e7be3b5af6dd579d75442f9f88acf63') prepare() { cd weston-$pkgver @@ -47,6 +49,7 @@ prepare() { patch -Np1 -i "${srcdir}/0006-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch" patch -Np1 -i "${srcdir}/0007-Add-nvidia-release-notes-file.patch" patch -Np1 -i "${srcdir}/0008-compositor-drm-Release-current-next-fb-when-deactiva.patch" + patch -Np1 -i "${srcdir}/0009-compositor-Process-stream-attach-requests-with-wl_eg.patch" } build() { |