AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-30 15:31:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip/sync-pre-swap-buffers' into 'master'

Browse Source 
Synchronize wl_surface state before wl_surface_commit

See merge request GNOME/gtk!75
This commit is contained in:
Matthias Clasen 2018-03-21 11:40:55 +00:00
commit 877b48579e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/wayland/gdkglcontext-wayland.c
View File

@ -223,6 +223,8 @@ gdk_wayland_gl_context_end_frame (GdkDrawContext *draw_context,
egl_surface = gdk_wayland_surface_get_egl_surface (surface->impl_surface, egl_surface = gdk_wayland_surface_get_egl_surface (surface->impl_surface,
context_wayland->egl_config); context_wayland->egl_config);
gdk_wayland_surface_sync (surface);
if (display_wayland->have_egl_swap_buffers_with_damage && damage != NULL) if (display_wayland->have_egl_swap_buffers_with_damage && damage != NULL)
{ {
int i, j, n_rects = cairo_region_num_rectangles (damage); int i, j, n_rects = cairo_region_num_rectangles (damage);
@ -243,8 +245,6 @@ gdk_wayland_gl_context_end_frame (GdkDrawContext *draw_context,
} }
else else
eglSwapBuffers (display_wayland->egl_display, egl_surface); eglSwapBuffers (display_wayland->egl_display, egl_surface);
gdk_wayland_surface_sync (surface);
} }
static void static void

4
gdk/wayland/gdkvulkancontext-wayland.c
View File

@ -66,9 +66,9 @@ gdk_vulkan_context_wayland_end_frame (GdkDrawContext *context,
{ {
GdkSurface *surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (context)); GdkSurface *surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (context));
GDK_DRAW_CONTEXT_CLASS (gdk_wayland_vulkan_context_parent_class)->end_frame (context, painted, damage);
gdk_wayland_surface_sync (surface); gdk_wayland_surface_sync (surface);
GDK_DRAW_CONTEXT_CLASS (gdk_wayland_vulkan_context_parent_class)->end_frame (context, painted, damage);
} }
static void static void