From 6559804d43833eac2f840d49255c19a7498ee0ad Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 27 Feb 2010 10:31:17 +0000 Subject: [PATCH] found booboo on non-bgra extended gl-es. SVN revision: 46576 --- legacy/evas/src/modules/engines/gl_common/evas_gl_context.c | 6 +++--- legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c index 1dd57a219f..beb2034e25 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c @@ -334,9 +334,9 @@ evas_gl_common_context_new(void) &(shared->info.anisotropic)); #endif #ifdef GL_BGRA - if ((strstr((char*) ext, "GL_EXT_bgra")) || - (strstr((char*) ext, "GL_EXT_texture_format_BGRA8888"))) - shared->info.bgra = 1; +// if ((strstr((char*) ext, "GL_EXT_bgra")) || +// (strstr((char*) ext, "GL_EXT_texture_format_BGRA8888"))) +// shared->info.bgra = 1; #endif } glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c index 42ff4a085f..c26ab24efd 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c @@ -244,9 +244,15 @@ evas_gl_common_texture_new(Evas_GL_Context *gc, RGBA_Image *im) im->cache_entry.h + 1, bgr_ifmt, bgr_fmt, &u, &v, &l_after, 1024); else +#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) + tex->pt = _pool_tex_find(gc, im->cache_entry.w + 3, + im->cache_entry.h + 1, rgba_ifmt, rgba_fmt, + &u, &v, &l_after, 1024); +#else tex->pt = _pool_tex_find(gc, im->cache_entry.w + 3, im->cache_entry.h + 1, rgb_ifmt, rgb_fmt, &u, &v, &l_after, 1024); +#endif } if (!tex->pt) {