5a3d85b1a2
Copy from home:dimstar:branches:GNOME:Factory/mutter via accept of submit request 32969 revision 3. Request was accepted with message: thanks, but bad patch name; I'll rename it OBS-URL: https://build.opensuse.org/request/show/32969 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=21
45 lines
1.5 KiB
Diff
45 lines
1.5 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
|
|
@@ -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]);
|