brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shaped-texture: Make sure to set the texture tower's texture

Browse Source 
This was part of the Wayland branch that I forgot to cherry-pick properly.
This commit is contained in:
Jasper St. Pierre 2014-02-05 15:35:00 -05:00
parent 8daefd92df
commit 18cfcc0221
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/compositor/meta-shaped-texture.c
View File

@ -567,8 +567,7 @@ meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
{ {
CoglTexture *base_texture; CoglTexture *base_texture;
priv->create_mipmaps = create_mipmaps; priv->create_mipmaps = create_mipmaps;
base_texture = create_mipmaps ? base_texture = create_mipmaps ? priv->texture : NULL;
COGL_TEXTURE (priv->texture) : NULL;
meta_texture_tower_set_base_texture (priv->paint_tower, base_texture); meta_texture_tower_set_base_texture (priv->paint_tower, base_texture);
} }
} }
@ -728,7 +727,13 @@ set_cogl_texture (MetaShapedTexture *stex,
clutter_actor_queue_relayout (CLUTTER_ACTOR (stex)); clutter_actor_queue_relayout (CLUTTER_ACTOR (stex));
} }
clutter_actor_queue_redraw (CLUTTER_ACTOR (stex)); /* NB: We don't queue a redraw of the actor here because we don't
* know how much of the buffer has changed with respect to the
* previous buffer. We only queue a redraw in response to surface
* damage. */
if (priv->create_mipmaps)
meta_texture_tower_set_base_texture (priv->paint_tower, cogl_tex);
} }
/** /**