diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-05 11:42:06 -0400 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-05 11:42:06 -0400 |
| commit | c39deb218178d1fb814dd2138ceff4b541a03d85 (patch) | |
| tree | 843478391dfc3bae3991d5bd83c7a1bc1aeff004 /ui/gtk-egl.c | |
| parent | e4d96a7eb83146c936d88182c8dee9ba899bb6bb (diff) | |
| parent | 1350ff156b25be65c599ecca9957ce6726c6d383 (diff) | |
| download | focaccia-qemu-c39deb218178d1fb814dd2138ceff4b541a03d85.tar.gz focaccia-qemu-c39deb218178d1fb814dd2138ceff4b541a03d85.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/egl-20211105-pull-request' into staging
gtk: a collection of egl fixes. # gpg: Signature made Fri 05 Nov 2021 07:30:21 AM EDT # gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] * remotes/kraxel/tags/egl-20211105-pull-request: ui/gtk-egl: blitting partial guest fb to the proper scanout surface ui/gtk: gd_draw_event returns FALSE when no cairo surface is bound ui/gtk-egl: guest fb texture needs to be regenerated when reinitializing egl ui/gtk-egl: make sure the right context is set as the current ui/gtk-egl: un-tab and re-tab should destroy egl surface and context virtio-gpu: splitting one extended mode guest fb into n-scanouts Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'ui/gtk-egl.c')
| -rw-r--r-- | ui/gtk-egl.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index e912b20075..f2026e4b5c 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -152,8 +152,13 @@ void gd_egl_refresh(DisplayChangeListener *dcl) } vc->gfx.gls = qemu_gl_init_shader(); if (vc->gfx.ds) { + surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds); surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds); } + if (vc->gfx.guest_fb.dmabuf) { + egl_dmabuf_release_texture(vc->gfx.guest_fb.dmabuf); + gd_egl_scanout_dmabuf(dcl, vc->gfx.guest_fb.dmabuf); + } } graphic_hw_update(dcl->con); @@ -178,6 +183,8 @@ void gd_egl_switch(DisplayChangeListener *dcl, surface_height(vc->gfx.ds) == surface_height(surface)) { resized = false; } + eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, + vc->gfx.esurface, vc->gfx.ectx); surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds); vc->gfx.ds = surface; @@ -237,6 +244,9 @@ void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, #ifdef CONFIG_GBM VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); + eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, + vc->gfx.esurface, vc->gfx.ectx); + egl_dmabuf_import_texture(dmabuf); if (!dmabuf->texture) { return; |