callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gl-sync-gtk3' into 'gtk-3-24'

Browse Source 
gl: Synchronize when calling MakeCurrent

See merge request GNOME/gtk!5448
This commit is contained in:
Matthias Clasen
2023-01-27 16:21:21 +00:00
parent b6795f8ff9 9811485990
commit a23dfcd4c1
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/gdkgl.c
View File

@ -352,6 +352,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
int alpha_size = 0;
cairo_region_t *clip_region;
GdkGLContextPaintData *paint_data;
GLsync sync = NULL;
impl_window = window->impl_window;
@ -366,7 +367,18 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
clip_region = gdk_cairo_region_from_clip (cr);
if (gdk_gl_context_get_current () != paint_context)
sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
gdk_gl_context_make_current (paint_context);
if (sync)
{
glWaitSync (sync, 0, GL_TIMEOUT_IGNORED);
glDeleteSync (sync);
sync = NULL;
}
paint_data = gdk_gl_context_get_paint_data (paint_context);
if (paint_data->tmp_framebuffer == 0)