diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-05-14 21:24:07 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 15:14:42 +0100 |
commit | 9e45491318ea7facbf1f517250e22f701245bba6 (patch) | |
tree | c5dea26168694605e8d0902ed9f3ce1eff332578 /meta/recipes-graphics/mutter/mutter | |
parent | 6b8f0097eab4dac8898bc54555a9a266b720b0ef (diff) | |
download | poky-9e45491318ea7facbf1f517250e22f701245bba6.tar.gz |
mutter: Recipe Update for clutter 1.6 update
set DEFAULT_PREFERENCE to -1 for git recipe
Update from clutter-1.4 to clutter-1.6
add fix_CGL_TEXTURE_RECTANGLE_ARB.patch
(From OE-Core rev: 35fa3f8c89104275870db9baa9d094232b1e7bfd)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mutter/mutter')
-rw-r--r-- | meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch new file mode 100644 index 0000000000..13197e5703 --- /dev/null +++ b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | Update the usage of CGL_TEXTURE_RECTANGLE_ARB to GL_TEXTURE_RECTANGLE_ARB | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c | ||
8 | =================================================================== | ||
9 | --- mutter-2.28.1_0.0.orig/src/compositor/mutter-shaped-texture.c | ||
10 | +++ mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c | ||
11 | @@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter | ||
12 | cogl_texture_get_gl_texture (priv->mask_texture, | ||
13 | &mask_gl_tex, &mask_gl_target); | ||
14 | |||
15 | - if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB) | ||
16 | + if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB) | ||
17 | glDeleteTextures (1, &mask_gl_tex); | ||
18 | |||
19 | cogl_texture_unref (priv->mask_texture); | ||
20 | @@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte | ||
21 | |||
22 | cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target); | ||
23 | |||
24 | - if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB) | ||
25 | + if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB) | ||
26 | { | ||
27 | GLuint tex; | ||
28 | |||
29 | glGenTextures (1, &tex); | ||
30 | - glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex); | ||
31 | + glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); | ||
32 | glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width); | ||
33 | glPixelStorei (GL_UNPACK_ALIGNMENT, 1); | ||
34 | glPixelStorei (GL_UNPACK_SKIP_ROWS, 0); | ||
35 | glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0); | ||
36 | - glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0, | ||
37 | + glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, | ||
38 | GL_ALPHA, tex_width, tex_height, | ||
39 | 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data); | ||
40 | |||
41 | priv->mask_texture | ||
42 | = cogl_texture_new_from_foreign (tex, | ||
43 | - CGL_TEXTURE_RECTANGLE_ARB, | ||
44 | + GL_TEXTURE_RECTANGLE_ARB, | ||
45 | tex_width, tex_height, | ||
46 | 0, 0, | ||
47 | COGL_PIXEL_FORMAT_A_8); | ||