fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-09 02:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl-renderer: do not unbind the context on output destroy

Browse source 
If we make EGL_NO_CONTEXT current, all following GL calls are
no-ops. This will be a problem when gl-renderer introduces
gl_renderer_color_transform containing GL textures and needs to destroy
them when weston_color_transform is destroyed. Mesa would print the the
warning that glDeleteTextures is no-op.

To fix this, keep our GL context current when destroying a GL output.

In case EGL_KHR_surfaceless_context is not available, we must use
dummy_surface.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2021-04-09 17:14:24 +03:00
parent 21b8ad5a16
commit 6d0aa8f0e9
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libweston/renderer-gl/gl-renderer.c
View file

@ -3442,8 +3442,7 @@ gl_renderer_output_destroy(struct weston_output *output)
gl_fbo_texture_fini(&go->shadow);
eglMakeCurrent(gr->egl_display,
EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
gr->dummy_surface, gr->dummy_surface, gr->egl_context);
weston_platform_destroy_egl_surface(gr->egl_display, go->egl_surface);