diff options
author | ChunEon Park <hermet@hermet.pe.kr> | 2014-06-23 12:01:01 +0900 |
---|---|---|
committer | ChunEon Park <hermet@hermet.pe.kr> | 2014-06-23 12:02:31 +0900 |
commit | cca1c500d5c5b21c3729e690035e2bfa63ef4a9d (patch) | |
tree | 447531944f194df227024c2d5ae029b428fbc9b2 | |
parent | 37431fb1a18bfa0c940a1f93b67c2e5d9cbb920a (diff) | |
download | efl-cca1c500d5c5b21c3729e690035e2bfa63ef4a9d.tar.gz |
evas/gl: increase message level and avoid unnecessary checking
the checking is introduced previous my commit 5f52f5c9e5758f52f2bc9e4b7220c8c61076f4ea.
-rw-r--r-- | src/modules/evas/engines/gl_common/evas_gl_texture.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c index a6005d57f1..be773518ad 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_texture.c +++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c @@ -130,8 +130,8 @@ _evas_gl_texture_search_format(Eina_Bool alpha, Eina_Bool bgra, Evas_Colorspace matching_format[i].cspace == cspace) return i; - ERR("Texture doesn't support the image format! colorspace(%d) alpha(%d) bgra(%d)", cspace, alpha, bgra); - return 0; + CRI("Texture doesn't support the image format! colorspace(%d) alpha(%d) bgra(%d)", cspace, alpha, bgra); + return -1; } static void @@ -881,12 +881,10 @@ evas_gl_common_texture_native_new(Evas_Engine_GL_Context *gc, unsigned int w, un Evas_GL_Texture *tex; int lformat; - lformat = _evas_gl_texture_search_format(alpha, gc->shared->info.bgra, EVAS_COLORSPACE_ARGB8888); - if (lformat < 0) return NULL; - tex = evas_gl_common_texture_alloc(gc, w, h, alpha); if (!tex) return NULL; + lformat = _evas_gl_texture_search_format(alpha, gc->shared->info.bgra, EVAS_COLORSPACE_ARGB8888); tex->pt = _pool_tex_native_new(gc, w, h, *matching_format[lformat].intformat, *matching_format[lformat].format, @@ -930,12 +928,11 @@ evas_gl_common_texture_dynamic_new(Evas_Engine_GL_Context *gc, Evas_GL_Image *im Evas_GL_Texture *tex; int lformat; - lformat = _evas_gl_texture_search_format(tex->alpha, gc->shared->info.bgra, EVAS_COLORSPACE_ARGB8888); - if (lformat < 0) return NULL; - tex = evas_gl_common_texture_alloc(gc, im->w, im->h, im->alpha); if (!tex) return NULL; + lformat = _evas_gl_texture_search_format(tex->alpha, gc->shared->info.bgra, EVAS_COLORSPACE_ARGB8888); + tex->pt = _pool_tex_dynamic_new(gc, tex->w, tex->h, *matching_format[lformat].intformat, *matching_format[lformat].format); |