From e224415a47ab8854f44d7ff63843c9ef3df9d7f9 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 2 Sep 2013 17:06:49 +0100 Subject: [PATCH] Revert "clutter-offscreen-effect: Allocate the cogl texture directly" This reverts commit 180e7d74f3325731ac5e91350233c26200a44fd7. The lazy texture allocation is gone in Cogl 1.15.9. --- clutter/clutter-offscreen-effect.c | 18 +++--------------- 1 file 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