brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

offscreen: Allocate the framebuffer in cogl_offscreen_new_to_texture_full

Browse Source 
The API says that it should return NULL on failure but it does not do that
due to the lazy allocation.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

https://bugzilla.gnome.org/show_bug.cgi?id=703174
This commit is contained in:
Adel Gadllah 2013-07-03 18:51:53 +02:00 committed by Robert Bragg
parent 28deb1919a
commit 64aa6092ce
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cogl/cogl-framebuffer.c
View File

@ -617,6 +617,7 @@ _cogl_offscreen_new_to_texture_full (CoglTexture *texture,
int level_width; int level_width;
int level_height; int level_height;
CoglOffscreen *ret; CoglOffscreen *ret;
CoglError *error = NULL;
_COGL_RETURN_VAL_IF_FAIL (cogl_is_texture (texture), NULL); _COGL_RETURN_VAL_IF_FAIL (cogl_is_texture (texture), NULL);
_COGL_RETURN_VAL_IF_FAIL (level < _cogl_texture_get_n_levels (texture), _COGL_RETURN_VAL_IF_FAIL (level < _cogl_texture_get_n_levels (texture),
@ -648,6 +649,13 @@ _cogl_offscreen_new_to_texture_full (CoglTexture *texture,
_cogl_texture_associate_framebuffer (texture, fb); _cogl_texture_associate_framebuffer (texture, fb);
if (!cogl_framebuffer_allocate (ret, &error))
{
cogl_object_unref (offscreen);
cogl_error_free (error);
ret = NULL;
}
return ret; return ret;
} }