isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-27 10:30:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

shaped-texture: Minor clean up

Browse Source 
Use cogl_clear_object(), add reference to texture when setting, and
remove redundant runtime type check.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/961
(cherry picked from commit 60ebf19c9e)
This commit is contained in:
Jonas Ådahl 2019-12-06 18:38:46 +01:00
parent e91b12fdf9
commit 81b7196ad9
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,16 +458,11 @@ set_cogl_texture (MetaShapedTexture *stex,
{ {
int width, height; int width, height;
g_return_if_fail (META_IS_SHAPED_TEXTURE (stex)); cogl_clear_object (&stex->texture);
if (stex->texture)
cogl_object_unref (stex->texture);
stex->texture = cogl_tex;
if (cogl_tex != NULL) if (cogl_tex != NULL)
{ {
cogl_object_ref (cogl_tex); stex->texture = cogl_object_ref (cogl_tex);
width = cogl_texture_get_width (COGL_TEXTURE (cogl_tex)); width = cogl_texture_get_width (COGL_TEXTURE (cogl_tex));
height = cogl_texture_get_height (COGL_TEXTURE (cogl_tex)); height = cogl_texture_get_height (COGL_TEXTURE (cogl_tex));
} }