diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-22 15:33:44 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 10:56:07 +0000 |
| commit | 7a2645575092684eec4bf7d96185f9e89141f4fe (patch) | |
| tree | 9d472defabde6e2e1359346b2ab5c66d4edeeb3c /meta/recipes-devtools | |
| parent | d5b8a65861adba298a9dc2c4e9a7a7da5490073a (diff) | |
| download | openembedded-core-contrib-7a2645575092684eec4bf7d96185f9e89141f4fe.tar.gz | |
qemu: add a backported patch to fix egl-headless support
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch | 50 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_3.1.0.bb | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch b/meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch new file mode 100644 index 0000000000..d9326c017a --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch @@ -0,0 +1,50 @@ +From 952e5d584f5aabe41298c278065fe628f3f7aa7a Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <kraxel@redhat.com> +Date: Thu, 29 Nov 2018 13:35:02 +0100 +Subject: [PATCH] egl-headless: add egl_create_context + +We must set the correct context (via eglMakeCurrent) before +calling qemu_egl_create_context, so we need a thin wrapper and can't +hook qemu_egl_create_context directly as ->dpy_gl_ctx_create callback. + +Reported-by: Frederik Carlier <frederik.carlier@quamotion.mobi> +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> +Message-id: 20181129123502.30129-1-kraxel@redhat.com + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=952e5d584f5aabe41298c278065fe628f3f7aa7a] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ui/egl-headless.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/ui/egl-headless.c b/ui/egl-headless.c +index 4cf3bbc0e4..519e7bad32 100644 +--- a/ui/egl-headless.c ++++ b/ui/egl-headless.c +@@ -38,6 +38,14 @@ static void egl_gfx_switch(DisplayChangeListener *dcl, + edpy->ds = new_surface; + } + ++static QEMUGLContext egl_create_context(DisplayChangeListener *dcl, ++ QEMUGLParams *params) ++{ ++ eglMakeCurrent(qemu_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, ++ qemu_egl_rn_ctx); ++ return qemu_egl_create_context(dcl, params); ++} ++ + static void egl_scanout_disable(DisplayChangeListener *dcl) + { + egl_dpy *edpy = container_of(dcl, egl_dpy, dcl); +@@ -150,7 +158,7 @@ static const DisplayChangeListenerOps egl_ops = { + .dpy_gfx_update = egl_gfx_update, + .dpy_gfx_switch = egl_gfx_switch, + +- .dpy_gl_ctx_create = qemu_egl_create_context, ++ .dpy_gl_ctx_create = egl_create_context, + .dpy_gl_ctx_destroy = qemu_egl_destroy_context, + .dpy_gl_ctx_make_current = qemu_egl_make_context_current, + .dpy_gl_ctx_get_current = qemu_egl_get_current_context, +-- +2.17.1 + diff --git a/meta/recipes-devtools/qemu/qemu_3.1.0.bb b/meta/recipes-devtools/qemu/qemu_3.1.0.bb index cd7cd67a3f..ea4277edde 100644 --- a/meta/recipes-devtools/qemu/qemu_3.1.0.bb +++ b/meta/recipes-devtools/qemu/qemu_3.1.0.bb @@ -22,6 +22,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ file://0001-Add-a-missing-X11-include.patch \ + file://0001-egl-headless-add-egl_create_context.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |