diff options
| author | Robert Bragg <robert@linux.intel.com> | 2013-06-23 21:06:48 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2014-01-09 15:29:30 +0000 |
| commit | 46f52396643ef821c083bd341a55315f3683d17a (patch) | |
| tree | ac1b22575768a862fbe83e6cb321e46856ac580e | |
| parent | 40c6b1cc2941a718e1d924073e447955ae757c50 (diff) | |
| download | cogl-46f52396643ef821c083bd341a55315f3683d17a.tar.gz | |
atlas: make zero size a programmer error
Instead of throwing a CoglError exception if an application tries to
allocate a zero size atlas texture this make that a programmer error
instead.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit d3eaeedc86d408669b81d6c43ef2b0ab9d859c85)
| -rw-r--r-- | cogl/cogl-atlas-texture.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c index 98d61ca5..5e2fd967 100644 --- a/cogl/cogl-atlas-texture.c +++ b/cogl/cogl-atlas-texture.c @@ -655,15 +655,8 @@ cogl_atlas_texture_new_with_size (CoglContext *ctx, CoglAtlasTexture *atlas_tex; /* We can't atlas zero-sized textures because it breaks the atlas - data structure */ - if (width < 1 || height < 1) - { - _cogl_set_error (error, - COGL_TEXTURE_ERROR, - COGL_TEXTURE_ERROR_SIZE, - "1x1 atlas textures not supported"); - return NULL; - } + * data structure */ + _COGL_RETURN_VAL_IF_FAIL (width > 0 && height > 0, NULL); /* If we can't use FBOs then it will be too slow to migrate textures and we shouldn't use the atlas */ |