diff options
| author | Dongwon Kim <dongwon.kim@intel.com> | 2023-07-24 17:11:31 -0700 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-08-07 17:13:42 +0400 |
| commit | 58ea90f8032912b41e753a95089ba764fcc6446a (patch) | |
| tree | 89f69c7615ac193545b4a2cc238a9f3163e30e13 | |
| parent | fdd649538e6c6c9ef99082cb74cc36dbb6b9f953 (diff) | |
| download | qemu-58ea90f8032912b41e753a95089ba764fcc6446a.zip qemu-58ea90f8032912b41e753a95089ba764fcc6446a.tar.gz qemu-58ea90f8032912b41e753a95089ba764fcc6446a.tar.bz2 | |
ui/gtk: set scanout mode in gd_egl/gd_gl_area_scanout_texture
Fixing a regression (black screen) caused by a commit 92b58156e7
("ui/gtk: set scanout-mode right before scheduling draw").
The commit 92b58156e7 was made with an assumption that the scanout
mode needs to be set only if the guest scanout is a dmabuf but there
are cases (e.g. virtio-gpu-virgl) where the scanout is still processed
in a form of a texture but is not backed by dmabuf. So it is needed
to put back the line that sets scanout mode in gd_egl_scanout_texture
and gd_gl_area_scanout_texture.
Fixes: 92b58156e7 ("ui/gtk: set scanout-mode right before scheduling draw)
Reported-by: Volker Rümelin <vr_qemu@t-online.de>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <20230725001131.24017-1-dongwon.kim@intel.com>
| -rw-r--r-- | ui/gtk-egl.c | 1 | ||||
| -rw-r--r-- | ui/gtk-gl-area.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index 4c29ac1..a1060fd 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -246,6 +246,7 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl, 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); } diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index 1ce34a2..52dcac1 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -268,6 +268,7 @@ void gd_gl_area_scanout_texture(DisplayChangeListener *dcl, return; } + gtk_gl_area_set_scanout_mode(vc, true); egl_fb_setup_for_tex(&vc->gfx.guest_fb, backing_width, backing_height, backing_id, false); } |