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

shaped-texture: never slice shape mask texture

Browse Source 
Since Cogl doesn't support multi-texturing with sliced textures and the
shape texture is combined with the texture-from-pixmap texture we need
to make sure we never construct a sliced mask texture. This patch simply
passes the COGL_TEXTURE_NO_SLICE flag to cogl_texture_from_data when
creating the shape mask texture.

https://bugzilla.gnome.org/show_bug.cgi?id=674731
This commit is contained in:
Robert Bragg 2012-04-24 17:48:19 -07:00
parent c44438b19f
commit a22859a64a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,12 +313,17 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
} }
else else
#endif /* GL_TEXTURE_RECTANGLE_ARB */ #endif /* GL_TEXTURE_RECTANGLE_ARB */
priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height, {
COGL_TEXTURE_NONE, /* Note: we don't allow slicing for this texture because we
COGL_PIXEL_FORMAT_A_8, * need to use it with multi-texturing which doesn't support
COGL_PIXEL_FORMAT_ANY, * sliced textures */
stride, priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
mask_data); COGL_TEXTURE_NO_SLICING,
COGL_PIXEL_FORMAT_A_8,
COGL_PIXEL_FORMAT_ANY,
stride,
mask_data);
}
g_free (mask_data); g_free (mask_data);