39721116a9
checked in (request 36384) OBS-URL: https://build.opensuse.org/request/show/36384 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=26
89 lines
3.1 KiB
Diff
89 lines
3.1 KiB
Diff
Index: mutter-2.29.0/src/compositor/mutter-shaped-texture.c
|
|
===================================================================
|
|
--- mutter-2.29.0.orig/src/compositor/mutter-shaped-texture.c
|
|
+++ mutter-2.29.0/src/compositor/mutter-shaped-texture.c
|
|
@@ -124,18 +124,18 @@ mutter_shaped_texture_dispose (GObject *
|
|
|
|
if (priv->material != COGL_INVALID_HANDLE)
|
|
{
|
|
- cogl_material_unref (priv->material);
|
|
+ cogl_handle_unref (priv->material);
|
|
priv->material = COGL_INVALID_HANDLE;
|
|
}
|
|
if (priv->material_unshaped != COGL_INVALID_HANDLE)
|
|
{
|
|
- cogl_material_unref (priv->material_unshaped);
|
|
+ cogl_handle_unref (priv->material_unshaped);
|
|
priv->material_unshaped = COGL_INVALID_HANDLE;
|
|
}
|
|
#if 1 /* see comment in mutter_shaped_texture_paint */
|
|
if (priv->material_workaround != COGL_INVALID_HANDLE)
|
|
{
|
|
- cogl_material_unref (priv->material_workaround);
|
|
+ cogl_handle_unref (priv->material_workaround);
|
|
priv->material_workaround = COGL_INVALID_HANDLE;
|
|
}
|
|
#endif
|
|
@@ -194,7 +194,7 @@ mutter_shaped_texture_dirty_mask (Mutter
|
|
if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB)
|
|
glDeleteTextures (1, &mask_gl_tex);
|
|
|
|
- cogl_texture_unref (priv->mask_texture);
|
|
+ cogl_handle_unref (priv->mask_texture);
|
|
priv->mask_texture = COGL_INVALID_HANDLE;
|
|
}
|
|
}
|
|
Index: mutter-2.29.0/src/compositor/mutter-texture-tower.c
|
|
===================================================================
|
|
--- mutter-2.29.0.orig/src/compositor/mutter-texture-tower.c
|
|
+++ mutter-2.29.0/src/compositor/mutter-texture-tower.c
|
|
@@ -131,7 +131,7 @@ free_texture (CoglHandle texture)
|
|
if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
|
|
glDeleteTextures (1, &gl_tex);
|
|
|
|
- cogl_texture_unref (texture);
|
|
+ cogl_handle_unref (texture);
|
|
}
|
|
|
|
/**
|
|
@@ -180,7 +180,7 @@ mutter_texture_tower_set_base_texture (M
|
|
#endif
|
|
}
|
|
|
|
- cogl_texture_unref (tower->textures[0]);
|
|
+ cogl_handle_unref (tower->textures[0]);
|
|
}
|
|
|
|
tower->textures[0] = texture;
|
|
@@ -189,7 +189,7 @@ mutter_texture_tower_set_base_texture (M
|
|
{
|
|
int width, height;
|
|
|
|
- cogl_texture_ref (tower->textures[0]);
|
|
+ cogl_handle_ref (tower->textures[0]);
|
|
|
|
width = cogl_texture_get_width (tower->textures[0]);
|
|
height = cogl_texture_get_height (tower->textures[0]);
|
|
Index: mutter-2.29.0/src/compositor/tidy/tidy-texture-frame.c
|
|
===================================================================
|
|
--- mutter-2.29.0.orig/src/compositor/tidy/tidy-texture-frame.c
|
|
+++ mutter-2.29.0/src/compositor/tidy/tidy-texture-frame.c
|
|
@@ -155,7 +155,7 @@ tidy_texture_frame_unrealize (ClutterAct
|
|
if (priv->material == COGL_INVALID_HANDLE)
|
|
return;
|
|
|
|
- cogl_material_unref (priv->material);
|
|
+ cogl_handle_unref (priv->material);
|
|
priv->material = COGL_INVALID_HANDLE;
|
|
|
|
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
|
|
@@ -415,7 +415,7 @@ tidy_texture_frame_dispose (GObject *gob
|
|
|
|
if (priv->material)
|
|
{
|
|
- cogl_material_unref (priv->material);
|
|
+ cogl_handle_unref (priv->material);
|
|
priv->material = COGL_INVALID_HANDLE;
|
|
}
|
|
|