evas/gl: increase message level and avoid unnecessary checking
authorChunEon Park <hermet@hermet.pe.kr>
Mon, 23 Jun 2014 03:01:01 +0000 (12:01 +0900)
committerChunEon Park <hermet@hermet.pe.kr>
Mon, 23 Jun 2014 03:02:31 +0000 (12:02 +0900)
the checking is introduced previous my commit 5f52f5c9e5758f52f2bc9e4b7220c8c61076f4ea.

src/modules/evas/engines/gl_common/evas_gl_texture.c

index a6005d5..be77351 100644 (file)
@@ -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);