AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

offload: Keep was-raised for each subsurface

Browse Source 
We need this information for proper diffing.
This commit is contained in:
Matthias Clasen 2023-11-18 01:44:58 -05:00
parent 00a63a9fcf
commit f9fd78b67e
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gsk/gskoffload.c
View File

@ -53,7 +53,6 @@ struct _GskOffload
Clip *current_clip; Clip *current_clip;
GskOffloadInfo *last_info; GskOffloadInfo *last_info;
gboolean can_raise;
}; };
static GdkTexture * static GdkTexture *
@ -347,7 +346,7 @@ visit_node (GskOffload *self,
{ {
gboolean has_clip; gboolean has_clip;
if (self->last_info && self->can_raise) if (self->last_info && self->last_info->can_raise)
{ {
graphene_rect_t transformed_bounds; graphene_rect_t transformed_bounds;
@ -366,7 +365,7 @@ visit_node (GskOffload *self,
"Can't raise subsurface %p because a %s overlaps", "Can't raise subsurface %p because a %s overlaps",
self->last_info->subsurface, self->last_info->subsurface,
g_type_name_from_instance ((GTypeInstance *) node)); g_type_name_from_instance ((GTypeInstance *) node));
self->can_raise = FALSE; self->last_info->can_raise = FALSE;
} }
} }
} }
@ -541,10 +540,16 @@ complex_clip:
if (info->texture) if (info->texture)
{ {
info->can_offload = TRUE; info->can_offload = TRUE;
info->can_raise = TRUE;
transform_bounds (self, &node->bounds, &info->rect); transform_bounds (self, &node->bounds, &info->rect);
info->place_above = self->last_info ? self->last_info->subsurface : NULL; if (self->last_info)
{
self->last_info->can_raise = !gsk_rect_intersects (&self->last_info->rect, &info->rect);
info->place_above = self->last_info->subsurface;
}
else
info->place_above = NULL;
self->last_info = info; self->last_info = info;
self->can_raise = TRUE;
} }
} }
} }
@ -583,6 +588,7 @@ gsk_offload_new (GdkSurface *surface,
GskOffloadInfo *info = &self->subsurfaces[i]; GskOffloadInfo *info = &self->subsurfaces[i];
info->subsurface = gdk_surface_get_subsurface (self->surface, i); info->subsurface = gdk_surface_get_subsurface (self->surface, i);
info->was_offloaded = gdk_subsurface_get_texture (info->subsurface) != NULL; info->was_offloaded = gdk_subsurface_get_texture (info->subsurface) != NULL;
info->was_above = gdk_subsurface_is_above_parent (info->subsurface);
/* Stack them all below, initially */ /* Stack them all below, initially */
gdk_subsurface_place_below (info->subsurface, NULL); gdk_subsurface_place_below (info->subsurface, NULL);
} }
@ -622,10 +628,11 @@ gsk_offload_new (GdkSurface *surface,
} }
} }
if (self->can_raise && self->last_info) if (self->last_info && self->last_info->can_raise)
{ {
GDK_DISPLAY_DEBUG (display, OFFLOAD, "Raising subsurface %p", self->last_info->subsurface); GDK_DISPLAY_DEBUG (display, OFFLOAD, "Raising subsurface %p", self->last_info->subsurface);
gdk_subsurface_place_above (self->last_info->subsurface, NULL); gdk_subsurface_place_above (self->last_info->subsurface, NULL);
self->last_info->is_above = TRUE;
} }
return self; return self;

6
gsk/gskoffloadprivate.h
View File

@ -32,9 +32,14 @@ typedef struct
GdkTexture *texture; GdkTexture *texture;
GdkSubsurface *place_above; GdkSubsurface *place_above;
graphene_rect_t rect; graphene_rect_t rect;
guint was_offloaded : 1; guint was_offloaded : 1;
guint can_offload : 1; guint can_offload : 1;
guint is_offloaded : 1; guint is_offloaded : 1;
guint was_above : 1;
guint can_raise : 1;
guint is_above : 1;
} GskOffloadInfo; } GskOffloadInfo;
GskOffload * gsk_offload_new (GdkSurface *surface, GskOffload * gsk_offload_new (GdkSurface *surface,
@ -49,4 +54,3 @@ gboolean gsk_offload_subsurface_was_offloaded (GskOffload *self,
gboolean gsk_offload_subsurface_is_offloaded (GskOffload *self, gboolean gsk_offload_subsurface_is_offloaded (GskOffload *self,
GdkSubsurface *subsurface); GdkSubsurface *subsurface);