ui/gtk: Make sure the right EGL context is currently bound
PATCH 1/1 ui/gtk: Make sure the right EGL context is currently bound
Observed a wrong context is bound when changing the scanout mode. To prevent problem, it is needed to make sure to bind the right context in gtk_egl_set_scanout_mode/gtk_gl_area_set_scanout_mode as well as unbind one in the end of gd_egl_update/gd_gl_area_update.
Cc Gerd Hoffmann <[email protected]>
Cc Marc-André Lureau <[email protected]>
Cc Vivek Kasireddy <[email protected]>
Signed-off-by Dongwon Kim <[email protected]>
--- ui/gtk-egl.c | 4 ++++ ui/gtk-gl-area.c | 2 ++ 2 files changed, 6 insertions(+)
ui/gtk-egl.c +4 -0
@@ -31,6 +31,8 @@ static void gtk_egl_set_scanout_mode(VirtualConsole *vc, bool scanout) vc->gfx.scanout_mode = scanout;if (!vc->gfx.scanout_mode) { +eglMakeCurrent (qemu_egl_display, vc->gfx.esurface, + vc->gfx.esurface, vc->gfx.ectx);egl_fb_destroy (&vc->gfx.guest_fb);if (vc->gfx.surface) {surface_gl_destroy_texture (vc->gfx.gls, vc->gfx.ds);
@@ -134,6 +136,8 @@ void gd_egl_update(DisplayChangeListener *dcl, vc->gfx.esurface, vc->gfx.ectx);surface_gl_update_texture (vc->gfx.gls, vc->gfx.ds, x, y, w, h); vc->gfx.glupdates++; +eglMakeCurrent (qemu_egl_display,EGL_NO_SURFACE , +EGL_NO_SURFACE ,EGL_NO_CONTEXT ); }void gd_egl_refresh (DisplayChangeListener *dcl)
ui/gtk-gl-area.c +2 -0
@@ -26,6 +26,7 @@ static void gtk_gl_area_set_scanout_mode(VirtualConsole *vc, bool scanout) vc->gfx.scanout_mode = scanout;if (!vc->gfx.scanout_mode) { +gtk_gl_area_make_current (GTK_GL_AREA (vc->gfx.drawing_area));egl_fb_destroy (&vc->gfx.guest_fb);if (vc->gfx.surface) {surface_gl_destroy_texture (vc->gfx.gls, vc->gfx.ds);
@@ -115,6 +116,7 @@ void gd_gl_area_update(DisplayChangeListener *dcl,gtk_gl_area_make_current (GTK_GL_AREA (vc->gfx.drawing_area));surface_gl_update_texture (vc->gfx.gls, vc->gfx.ds, x, y, w, h); vc->gfx.glupdates++; +gdk_gl_context_clear_current (); }void gd_gl_area_refresh (DisplayChangeListener *dcl)
Signature · 1 line
2.34.1
Quoted 10 lines · Dongwon Kim
Observed a wrong context is bound when changing the scanout mode. To prevent problem, it is needed to make sure to bind the right context in gtk_egl_set_scanout_mode/gtk_gl_area_set_scanout_mode as well as unbind one in the end of gd_egl_update/gd_gl_area_update.
Cc Gerd Hoffmann <[email protected]>Cc Marc-André Lureau <[email protected]>Cc Vivek Kasireddy <[email protected]>Signed-off-by Dongwon Kim <[email protected]>
Reviewed-by Marc-André Lureau <[email protected]>
Quoted 54 lines
--- ui/gtk-egl.c | 4 ++++ ui/gtk-gl-area.c | 2 ++ 2 files changed, 6 insertions(+)ui/gtk-egl.c +2
-0@@ -31,6 +31,8 @@ static void gtk_egl_set_scanout_mode(VirtualConsole *vc, bool scanout) vc->gfx.scanout_mode = scanout;if (!vc->gfx.scanout_mode) { +eglMakeCurrent (qemu_egl_display, vc->gfx.esurface, + vc->gfx.esurface, vc->gfx.ectx);egl_fb_destroy (&vc->gfx.guest_fb);if (vc->gfx.surface) {surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds);ui/gtk-egl.c +2
-0@@ -134,6 +136,8 @@ void gd_egl_update(DisplayChangeListener *dcl, vc->gfx.esurface, vc->gfx.ectx);surface_gl_update_texture (vc->gfx.gls, vc->gfx.ds, x, y, w, h); vc->gfx.glupdates++; +eglMakeCurrent (qemu_egl_display,EGL_NO_SURFACE , +EGL_NO_SURFACE ,EGL_NO_CONTEXT ); }void gd_egl_refresh (DisplayChangeListener *dcl)ui/gtk-gl-area.c +1
-0@@ -26,6 +26,7 @@ static void gtk_gl_area_set_scanout_mode(VirtualConsole *vc, bool scanout) vc->gfx.scanout_mode = scanout;if (!vc->gfx.scanout_mode) { +gtk_gl_area_make_current (GTK_GL_AREA (vc->gfx.drawing_area));egl_fb_destroy (&vc->gfx.guest_fb);if (vc->gfx.surface) {surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds);ui/gtk-gl-area.c +1
-1@@ -115,6 +116,7 @@ void gd_gl_area_update(DisplayChangeListener *dcl,gtk_gl_area_make_current (GTK_GL_AREA (vc->gfx.drawing_area));surface_gl_update_texture (vc->gfx.gls, vc->gfx.ds, x, y, w, h); vc->gfx.glupdates++; +gdk_gl_context_clear_current (); }void gd_gl_area_refresh (DisplayChangeListener *dcl) --2.34.1
Signature · 1 line
Marc-André Lureau