Merge branch 'gtk-3-24' into 'gtk-3-24'
Address regression in 3.24.37 (issue 5711) by checking that the context is not NULL. See merge request GNOME/gtk!5754
This commit is contained in:
commit
66a94161bd
@ -367,7 +367,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
|
|||||||
|
|
||||||
clip_region = gdk_cairo_region_from_clip (cr);
|
clip_region = gdk_cairo_region_from_clip (cr);
|
||||||
|
|
||||||
if (gdk_gl_context_get_current () != paint_context)
|
if ((gdk_gl_context_get_current () != NULL) && (gdk_gl_context_get_current () != paint_context))
|
||||||
sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
|
sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
|
||||||
|
|
||||||
gdk_gl_context_make_current (paint_context);
|
gdk_gl_context_make_current (paint_context);
|
||||||
|
Loading…
Reference in New Issue
Block a user