diff options
| author | Volker Rümelin <vr_qemu@t-online.de> | 2023-11-11 11:40:20 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-12-04 10:55:18 +0400 |
| commit | 53a939f1bf8e4a3e38f9449fac44f572676966ad (patch) | |
| tree | a651e5ca2dff8f0bcda1ff740d9be1d3256edc75 | |
| parent | 29b5d70cb70574b499517ec9e9f80dea496a3cc0 (diff) | |
| download | qemu-53a939f1bf8e4a3e38f9449fac44f572676966ad.zip qemu-53a939f1bf8e4a3e38f9449fac44f572676966ad.tar.gz qemu-53a939f1bf8e4a3e38f9449fac44f572676966ad.tar.bz2 | |
ui/gtk-egl: move function calls back to regular code path
Commit 6f189a08c1 ("ui/gtk-egl: Check EGLSurface before doing
scanout") introduced a regression when QEMU is running with a
virtio-gpu-gl-device on a host under X11. After the guest has
initialized the virtio-gpu-gl-device, the guest screen only
shows "Display output is not active.".
Commit 6f189a08c1 moved all function calls in
gd_egl_scanout_texture() to a code path which is only called
once after gd_egl_init() succeeds in gd_egl_scanout_texture().
Move all function calls in gd_egl_scanout_texture() back to
the regular code path so they get always called if one of the
gd_egl_init() calls was successful.
Fixes: 6f189a08c1 ("ui/gtk-egl: Check EGLSurface before doing scanout")
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20231111104020.26183-1-vr_qemu@t-online.de>
| -rw-r--r-- | ui/gtk-egl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index cd2f176..3af5ac5 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -249,14 +249,14 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl, if (!vc->gfx.esurface) { return; } + } - eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, - vc->gfx.esurface, vc->gfx.ectx); + eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, + vc->gfx.esurface, vc->gfx.ectx); - gtk_egl_set_scanout_mode(vc, true); - egl_fb_setup_for_tex(&vc->gfx.guest_fb, backing_width, backing_height, - backing_id, false); - } + gtk_egl_set_scanout_mode(vc, true); + egl_fb_setup_for_tex(&vc->gfx.guest_fb, backing_width, backing_height, + backing_id, false); } void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, |