found booboo on non-bgra extended gl-es.

SVN revision: 46576
This commit is contained in:
Carsten Haitzler 2010-02-27 10:31:17 +00:00
parent b8955f3a50
commit 6559804d43
2 changed files with 9 additions and 3 deletions

View File

@ -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,

View File

@ -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)
{