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

gdk-wayland: Do not leak dummy 1x1 surface on every draw

Browse Source 
When using EGL, neither leak nor re-create the dummy 1x1 Cairo
surface every time gdk_wayland_window_ensure_cairo_surface()
is called.

https://bugzilla.gnome.org/show_bug.cgi?id=775126
This commit is contained in:
Daniel Elstner 2017-09-26 21:13:40 +02:00
parent 701f82d1c3
commit a57630b30c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/wayland/gdkwindow-wayland.c
View File

@ -840,14 +840,17 @@ gdk_wayland_window_ensure_cairo_surface (GdkWindow *window)
{ {
if (impl->staging_cairo_surface && if (impl->staging_cairo_surface &&
_gdk_wayland_is_shm_surface (impl->staging_cairo_surface)) _gdk_wayland_is_shm_surface (impl->staging_cairo_surface))
cairo_surface_destroy (impl->staging_cairo_surface); g_clear_pointer (&impl->staging_cairo_surface, cairo_surface_destroy);
if (!impl->staging_cairo_surface)
{
impl->staging_cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, impl->staging_cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
impl->scale, impl->scale,
impl->scale); impl->scale);
cairo_surface_set_device_scale (impl->staging_cairo_surface, cairo_surface_set_device_scale (impl->staging_cairo_surface,
impl->scale, impl->scale); impl->scale, impl->scale);
} }
}
else if (!impl->staging_cairo_surface) else if (!impl->staging_cairo_surface)
{ {
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (impl->wrapper)); GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (impl->wrapper));