summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdel Gadllah <adel.gadllah@gmail.com>2013-06-25 15:04:19 +0200
committerAdel Gadllah <adel.gadllah@gmail.com>2013-06-25 20:29:54 +0200
commitb416224d30ea5ace492f1497101a172a6fb32997 (patch)
tree8a884192ff5e721f2f459613c1310b3961ae665f
parent23f9444795d7a3115d187cd0196421c4d642a62f (diff)
downloadclutter-b416224d30ea5ace492f1497101a172a6fb32997.tar.gz
clutter-offscreen-effect: Allocate the cogl texture directly
Cogl now lazy loads the textures so we cannot rely on getting NULL from cogl_texture_new_with_size so we have to allocate it by ourselves. https://bugzilla.redhat.com/show_bug.cgi?id=975171
-rw-r--r--clutter/clutter-offscreen-effect.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/clutter/clutter-offscreen-effect.c b/clutter/clutter-offscreen-effect.c
index b655b5dbb..d3ffaea5f 100644
--- a/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter-offscreen-effect.c
@@ -139,9 +139,21 @@ clutter_offscreen_effect_real_create_texture (ClutterOffscreenEffect *effect,
gfloat width,
gfloat height)
{
- return cogl_texture_new_with_size (MAX (width, 1), MAX (height, 1),
- COGL_TEXTURE_NO_SLICING,
- COGL_PIXEL_FORMAT_RGBA_8888_PRE);
+ CoglError *error = NULL;
+ CoglHandle texture = cogl_texture_new_with_size (MAX (width, 1), MAX (height, 1),
+ COGL_TEXTURE_NO_SLICING,
+ COGL_PIXEL_FORMAT_RGBA_8888_PRE);
+
+ if (!cogl_texture_allocate (texture, &error))
+ {
+#if CLUTTER_ENABLE_DEBUG
+ g_warning ("Unable to allocate texture for offscreen effect: %s", error->message);
+#endif /* CLUTTER_ENABLE_DEBUG */
+ cogl_error_free (error);
+ return NULL;
+ }
+
+ return texture;
}
static gboolean