summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2013-09-02 17:06:49 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2013-09-02 17:06:49 +0100
commite224415a47ab8854f44d7ff63843c9ef3df9d7f9 (patch)
treed35700d3fa5616aac213b4f3f3fd54be9adecc61
parent8f88ada0c6bc18e39e126d92776c1d314de961e7 (diff)
downloadclutter-e224415a47ab8854f44d7ff63843c9ef3df9d7f9.tar.gz
Revert "clutter-offscreen-effect: Allocate the cogl texture directly"
This reverts commit 180e7d74f3325731ac5e91350233c26200a44fd7. The lazy texture allocation is gone in Cogl 1.15.9.
-rw-r--r--clutter/clutter-offscreen-effect.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/clutter/clutter-offscreen-effect.c b/clutter/clutter-offscreen-effect.c
index 5c053df68..de7191294 100644
--- a/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter-offscreen-effect.c
@@ -139,21 +139,9 @@ clutter_offscreen_effect_real_create_texture (ClutterOffscreenEffect *effect,
gfloat width,
gfloat height)
{
- 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;
+ return cogl_texture_new_with_size (MAX (width, 1), MAX (height, 1),
+ COGL_TEXTURE_NO_SLICING,
+ COGL_PIXEL_FORMAT_RGBA_8888_PRE);
}
static gboolean