[mutter/wayland] Update for Cogl API breaks
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] Update for Cogl API breaks
- Date: Mon, 13 Jan 2014 18:08:26 +0000 (UTC)
commit 419dfd333af2aab0924aaf2bf6f66a156df9d1f2
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Jan 13 13:03:19 2014 -0500
Update for Cogl API breaks
configure.ac | 2 +-
src/compositor/meta-texture-rectangle.c | 9 ++-------
src/compositor/meta-texture-rectangle.h | 4 +---
src/compositor/meta-texture-tower.c | 4 ----
src/compositor/meta-window-actor.c | 5 +----
src/core/meta-cursor-tracker.c | 1 -
6 files changed, 5 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dad1e2c..87aff64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ MUTTER_PC_MODULES="
gsettings-desktop-schemas >= 3.7.3
xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
$CLUTTER_PACKAGE >= 1.17.1
- cogl-1.0 >= 1.13.3
+ cogl-1.0 >= 1.17.1
upower-glib >= 0.99.0
gnome-desktop-3.0
"
diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
index 3fc9430..450155d 100644
--- a/src/compositor/meta-texture-rectangle.c
+++ b/src/compositor/meta-texture-rectangle.c
@@ -30,10 +30,8 @@ CoglTexture *
meta_texture_rectangle_new (unsigned int width,
unsigned int height,
CoglPixelFormat format,
- CoglPixelFormat internal_format,
unsigned int rowstride,
- const guint8 *data,
- GError **error)
+ const guint8 *data)
{
ClutterBackend *backend =
clutter_get_default_backend ();
@@ -41,10 +39,7 @@ meta_texture_rectangle_new (unsigned int width,
clutter_backend_get_cogl_context (backend);
CoglTextureRectangle *tex_rect;
- tex_rect = cogl_texture_rectangle_new_with_size (context,
- width, height,
- internal_format,
- error);
+ tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
if (tex_rect == NULL)
return NULL;
diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
index 30f60d3..7b84229 100644
--- a/src/compositor/meta-texture-rectangle.h
+++ b/src/compositor/meta-texture-rectangle.h
@@ -32,10 +32,8 @@ CoglTexture *
meta_texture_rectangle_new (unsigned int width,
unsigned int height,
CoglPixelFormat format,
- CoglPixelFormat internal_format,
unsigned int rowstride,
- const guint8 *data,
- GError **error);
+ const guint8 *data);
gboolean
meta_texture_rectangle_check (CoglTexture *texture);
diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
index 207abb2..a53147f 100644
--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.c
@@ -359,13 +359,9 @@ texture_tower_create_texture (MetaTextureTower *tower,
meta_texture_rectangle_new (width, height,
/* data format */
TEXTURE_FORMAT,
- /* internal cogl format */
- TEXTURE_FORMAT,
/* rowstride */
width * 4,
/* data */
- NULL,
- /* error */
NULL);
}
else
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index c5a2af4..d5c1a4e 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -2174,10 +2174,7 @@ build_and_scan_frame_mask (MetaWindowActor *self,
{
mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
COGL_PIXEL_FORMAT_A_8,
- COGL_PIXEL_FORMAT_A_8,
- stride,
- mask_data,
- NULL /* error */);
+ stride, mask_data);
}
else
{
diff --git a/src/core/meta-cursor-tracker.c b/src/core/meta-cursor-tracker.c
index a603d95..df8de3d 100644
--- a/src/core/meta-cursor-tracker.c
+++ b/src/core/meta-cursor-tracker.c
@@ -748,7 +748,6 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)
cursor_image->width,
cursor_image->height,
CLUTTER_CAIRO_FORMAT_ARGB32,
- COGL_PIXEL_FORMAT_ANY,
cursor_image->width * 4, /* stride */
cursor_data,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]