diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2016-05-07 22:21:24 +0800 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2016-07-20 14:23:48 +0800 |
| commit | dd1eaeb262ff7ed7ca9531c8125e3eb35a33aad1 (patch) | |
| tree | 05f6996b600bdd462cb4fb5674250caed8dda68f /src/compositor/meta-background.c | |
| parent | f096cc327d08d492ccfc45d0d6a8344a759083d5 (diff) | |
| download | mutter-dd1eaeb262ff7ed7ca9531c8125e3eb35a33aad1.tar.gz | |
Use correct cogl object types
Use the correct pointer types for cogl objects. This avoids warnings
when including the cogl headers doesn't result in all the cogl types
being typedefs to void.
https://bugzilla.gnome.org/show_bug.cgi?id=768976
Diffstat (limited to 'src/compositor/meta-background.c')
| -rw-r--r-- | src/compositor/meta-background.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c index 0c8aefacb..00d18f1fd 100644 --- a/src/compositor/meta-background.c +++ b/src/compositor/meta-background.c @@ -39,7 +39,7 @@ struct _MetaBackgroundMonitor { gboolean dirty; CoglTexture *texture; - CoglOffscreen *fbo; + CoglFramebuffer *fbo; }; struct _MetaBackgroundPrivate @@ -662,6 +662,7 @@ ensure_wallpaper_texture (MetaBackground *self, { int width = cogl_texture_get_width (texture); int height = cogl_texture_get_height (texture); + CoglOffscreen *offscreen; CoglFramebuffer *fbo; CoglError *catch_error = NULL; CoglPipeline *pipeline; @@ -669,7 +670,8 @@ ensure_wallpaper_texture (MetaBackground *self, priv->wallpaper_texture = meta_create_texture (width, height, COGL_TEXTURE_COMPONENTS_RGBA, META_TEXTURE_FLAGS_NONE); - fbo = cogl_offscreen_new_with_texture (priv->wallpaper_texture); + offscreen = cogl_offscreen_new_with_texture (priv->wallpaper_texture); + fbo = COGL_FRAMEBUFFER (offscreen); if (!cogl_framebuffer_allocate (fbo, &catch_error)) { @@ -786,10 +788,13 @@ meta_background_get_texture (MetaBackground *self, if (monitor->texture == NULL) { + CoglOffscreen *offscreen; + monitor->texture = meta_create_texture (monitor_area.width, monitor_area.height, COGL_TEXTURE_COMPONENTS_RGBA, META_TEXTURE_FLAGS_NONE); - monitor->fbo = cogl_offscreen_new_with_texture (monitor->texture); + offscreen = cogl_offscreen_new_with_texture (monitor->texture); + monitor->fbo = COGL_FRAMEBUFFER (offscreen); } if (!cogl_framebuffer_allocate (monitor->fbo, &catch_error)) |