st-theme-node: reuse box-shadow materials between paint states when possible

This commit is contained in:
Lionel Landwerlin 2013-07-04 14:26:08 +01:00
parent aee90a3116
commit 9391d9d11b
3 changed files with 31 additions and 3 deletions

View File

@ -1478,6 +1478,19 @@ st_theme_node_render_resources (StThemeNodePaintState *state,
else if (node->background_color.alpha > 0 || has_border) else if (node->background_color.alpha > 0 || has_border)
st_theme_node_prerender_shadow (state); st_theme_node_prerender_shadow (state);
} }
/* If we don't have cached textures yet, check whether we can cache
them. */
if (!node->cached_textures)
{
if (state->prerendered_material == COGL_INVALID_HANDLE &&
width >= node->box_shadow_min_width &&
height >= node->box_shadow_min_height)
{
st_theme_node_paint_state_copy (&node->cached_state, state);
node->cached_textures = TRUE;
}
}
} }
static void static void
@ -2371,12 +2384,22 @@ st_theme_node_paint (StThemeNode *node,
return; return;
if (st_theme_node_needs_new_box_shadow_for_size (state, node, width, height)) if (st_theme_node_needs_new_box_shadow_for_size (state, node, width, height))
st_theme_node_render_resources (state, node, width, height); {
/* If we had the ability to cache textures on the node, then we
can just copy them over to the paint state and avoid all
rendering. We end up sharing textures a cross different
widgets. */
if (node->rendered_once && node->cached_textures &&
width >= node->box_shadow_min_width && height >= node->box_shadow_min_height)
st_theme_node_paint_state_copy (state, &node->cached_state);
else
st_theme_node_render_resources (state, node, width, height);
node->rendered_once = TRUE;
}
else else
st_theme_node_update_resources (state, node, width, height); st_theme_node_update_resources (state, node, width, height);
node->rendered_once = TRUE;
/* Rough notes about the relationship of borders and backgrounds in CSS3; /* Rough notes about the relationship of borders and backgrounds in CSS3;
* see http://www.w3.org/TR/css3-background/ for more accurate details. * see http://www.w3.org/TR/css3-background/ for more accurate details.
* *

View File

@ -100,6 +100,7 @@ struct _StThemeNode {
guint text_shadow_computed : 1; guint text_shadow_computed : 1;
guint link_type : 2; guint link_type : 2;
guint rendered_once : 1; guint rendered_once : 1;
guint cached_textures : 1;
int box_shadow_min_width; int box_shadow_min_width;
int box_shadow_min_height; int box_shadow_min_height;
@ -109,6 +110,8 @@ struct _StThemeNode {
CoglHandle background_texture; CoglHandle background_texture;
CoglHandle background_material; CoglHandle background_material;
CoglHandle background_shadow_material; CoglHandle background_shadow_material;
StThemeNodePaintState cached_state;
}; };
struct _StThemeNodeClass { struct _StThemeNodeClass {

View File

@ -101,6 +101,8 @@ st_theme_node_dispose (GObject *gobject)
g_signal_handlers_disconnect_by_func (node->theme, g_signal_handlers_disconnect_by_func (node->theme,
on_custom_stylesheets_changed, node); on_custom_stylesheets_changed, node);
st_theme_node_paint_state_free (&node->cached_state);
g_clear_object (&node->theme); g_clear_object (&node->theme);
G_OBJECT_CLASS (st_theme_node_parent_class)->dispose (gobject); G_OBJECT_CLASS (st_theme_node_parent_class)->dispose (gobject);