| Message ID | 20210703002809.26753-2-dongwon.kim@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] ui/gtk-egl: un-tab and re-tab should destroy egl surface and context | expand |
Acknowledged-by: Vivek Kasireddy <vivek.kasireddy@intel.com> > -----Original Message----- > From: Qemu-devel <qemu-devel-bounces+vivek.kasireddy=intel.com@nongnu.org> On > Behalf Of Dongwon Kim > Sent: Friday, July 02, 2021 5:28 PM > To: qemu-devel@nongnu.org > Cc: Kim, Dongwon <dongwon.kim@intel.com> > Subject: [PATCH 2/3] ui/gtk-egl: make sure the right context is set as the current > > Making the vc->gfx.ectx current before handling textures > associated with it > > Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> > --- > ui/gtk-egl.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c > index 2a2e6d3a17..32516b806c 100644 > --- a/ui/gtk-egl.c > +++ b/ui/gtk-egl.c > @@ -126,6 +126,7 @@ 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); > } > } > @@ -152,6 +153,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; > @@ -209,6 +212,11 @@ void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, > QemuDmaBuf *dmabuf) > { > #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; > -- > 2.17.1 >
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index 2a2e6d3a17..32516b806c 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -126,6 +126,7 @@ 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); } } @@ -152,6 +153,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; @@ -209,6 +212,11 @@ void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf) { #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;
Making the vc->gfx.ectx current before handling textures associated with it Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> --- ui/gtk-egl.c | 8 ++++++++ 1 file changed, 8 insertions(+)