| 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 |
| |