isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for Cogl API breaks

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-01-13 13:03:19 -05:00
parent 0b003bb895
commit d2a1db8834
6 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -76,7 +76,7 @@ MUTTER_PC_MODULES="
gsettings-desktop-schemas >= 3.7.3 gsettings-desktop-schemas >= 3.7.3
xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
$CLUTTER_PACKAGE >= 1.15.90 $CLUTTER_PACKAGE >= 1.15.90
cogl-1.0 >= 1.15.6 cogl-1.0 >= 1.17.1
upower-glib >= 0.99.0 upower-glib >= 0.99.0
gnome-desktop-3.0 gnome-desktop-3.0
" "

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

@ -30,10 +30,8 @@ CoglTexture *
meta_texture_rectangle_new (unsigned int width, meta_texture_rectangle_new (unsigned int width,
unsigned int height, unsigned int height,
CoglPixelFormat format, CoglPixelFormat format,
CoglPixelFormat internal_format,
unsigned int rowstride, unsigned int rowstride,
const guint8 *data, const guint8 *data)
GError **error)
{ {
ClutterBackend *backend = ClutterBackend *backend =
clutter_get_default_backend (); clutter_get_default_backend ();
@ -41,10 +39,7 @@ meta_texture_rectangle_new (unsigned int width,
clutter_backend_get_cogl_context (backend); clutter_backend_get_cogl_context (backend);
CoglTextureRectangle *tex_rect; CoglTextureRectangle *tex_rect;
tex_rect = cogl_texture_rectangle_new_with_size (context, tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
width, height,
internal_format,
error);
if (tex_rect == NULL) if (tex_rect == NULL)
return NULL; return NULL;

4
src/compositor/meta-texture-rectangle.h
View File

@ -32,10 +32,8 @@ CoglTexture *
meta_texture_rectangle_new (unsigned int width, meta_texture_rectangle_new (unsigned int width,
unsigned int height, unsigned int height,
CoglPixelFormat format, CoglPixelFormat format,
CoglPixelFormat internal_format,
unsigned int rowstride, unsigned int rowstride,
const guint8 *data, const guint8 *data);
GError **error);
gboolean gboolean
meta_texture_rectangle_check (CoglTexture *texture); meta_texture_rectangle_check (CoglTexture *texture);

4
src/compositor/meta-texture-tower.c
View File

@ -363,13 +363,9 @@ texture_tower_create_texture (MetaTextureTower *tower,
meta_texture_rectangle_new (width, height, meta_texture_rectangle_new (width, height,
/* data format */ /* data format */
TEXTURE_FORMAT, TEXTURE_FORMAT,
/* internal cogl format */
TEXTURE_FORMAT,
/* rowstride */ /* rowstride */
width * 4, width * 4,
/* data */ /* data */
NULL,
/* error */
NULL); NULL);
} }
else else

5
src/compositor/meta-window-actor.c
View File

@ -2167,10 +2167,7 @@ build_and_scan_frame_mask (MetaWindowActor *self,
{ {
mask_texture = meta_texture_rectangle_new (tex_width, tex_height, mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
COGL_PIXEL_FORMAT_A_8, COGL_PIXEL_FORMAT_A_8,
COGL_PIXEL_FORMAT_A_8, stride, mask_data);
stride,
mask_data,
NULL /* error */);
} }
else else
{ {

1
src/core/meta-cursor-tracker.c
View File

@ -307,7 +307,6 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)
cursor_image->width, cursor_image->width,
cursor_image->height, cursor_image->height,
CLUTTER_CAIRO_FORMAT_ARGB32, CLUTTER_CAIRO_FORMAT_ARGB32,
COGL_PIXEL_FORMAT_ANY,
cursor_image->width * 4, /* stride */ cursor_image->width * 4, /* stride */
cursor_data, cursor_data,
NULL); NULL);