AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

x11: Factor out some of frame sync code into subroutines

Browse Source 
This commit moves some of the end frame sync counter handling
code to subroutines.

It's a minor readability win, but the main motivation is to
make it easier in a subsequent commit to defer updating the
sync counter until a more appropriate time.
This commit is contained in:
Ray Strode 2020-06-02 16:29:03 -04:00
parent 10f2b11fda
commit f8770b78ea
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gdk/x11/gdksurface-x11.c
View File

@ -360,6 +360,37 @@ gdk_x11_surface_begin_frame (GdkSurface *surface,
} }
} }
static gboolean
should_sync_frame_drawing (GdkSurface *surface)
{
GdkX11Surface *impl = GDK_X11_SURFACE (surface);
/* disabled client side */
if (!impl->frame_sync_enabled)
return FALSE;
/* disabled compositor side */
if (!gdk_x11_screen_supports_net_wm_hint (GDK_SURFACE_SCREEN (surface),
g_intern_static_string ("_NET_WM_FRAME_DRAWN")))
return FALSE;
return TRUE;
}
static void
sync_counter_for_end_frame (GdkSurface *surface)
{
GdkX11Surface *impl = GDK_X11_SURFACE (surface);
g_assert (!impl->toplevel->in_frame);
g_assert (impl->toplevel->extended_update_counter != None);
g_assert ((impl->toplevel->current_counter_value % 2) == 0);
set_sync_counter (GDK_SURFACE_XDISPLAY (surface),
impl->toplevel->extended_update_counter,
impl->toplevel->current_counter_value);
}
static void static void
gdk_x11_surface_end_frame (GdkSurface *surface) gdk_x11_surface_end_frame (GdkSurface *surface)
{ {
@ -405,13 +436,9 @@ gdk_x11_surface_end_frame (GdkSurface *surface)
else else
impl->toplevel->current_counter_value += 1; impl->toplevel->current_counter_value += 1;
set_sync_counter(GDK_SURFACE_XDISPLAY (surface), sync_counter_for_end_frame (surface);
impl->toplevel->extended_update_counter,
impl->toplevel->current_counter_value);
if (impl->frame_sync_enabled && if (should_sync_frame_drawing (surface))
gdk_x11_screen_supports_net_wm_hint (GDK_SURFACE_SCREEN (surface),
g_intern_static_string ("_NET_WM_FRAME_DRAWN")))
{ {
impl->toplevel->frame_pending = TRUE; impl->toplevel->frame_pending = TRUE;
gdk_surface_freeze_updates (surface); gdk_surface_freeze_updates (surface);