jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=45374e25360500f31dd23b0ffcb341aeb26906f2
commit 45374e25360500f31dd23b0ffcb341aeb26906f2 Author: Jean-Philippe Andre <[email protected]> Date: Thu Nov 27 20:15:40 2014 +0900 Evas GL: Also add read bgra for desktop GL --- src/modules/evas/engines/gl_common/evas_gl_api_ext.c | 7 +++++-- src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h | 8 ++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c index a79efdd..ef3e87f 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c +++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c @@ -264,8 +264,11 @@ evgl_api_ext_init(void *getproc, const char *glueexts) #ifndef GL_GLES /* Add some extension strings that are always working on desktop GL */ - strcat(_gl_ext_string, "GL_EXT_texture_format_BGRA8888 "); - strcat(_gl_ext_string_official, "GL_EXT_texture_format_BGRA8888 "); + static const char *desktop_exts = + "GL_EXT_read_format_bgra " + "GL_EXT_texture_format_BGRA8888"; + strcpy(_gl_ext_string, desktop_exts); + strcpy(_gl_ext_string_official, desktop_exts); #endif ///////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h index 135ce74..83d4188 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h +++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h @@ -409,11 +409,7 @@ _EVASGL_EXT_BEGIN(blend_minmax) _EVASGL_EXT_DRVNAME(GL_EXT_blend_minmax) _EVASGL_EXT_END() -_EVASGL_EXT_BEGIN(read_format_bgra) // Desktop differs - _EVASGL_EXT_DRVNAME(GL_EXT_read_format_bgra) -_EVASGL_EXT_END() - -_EVASGL_EXT_BEGIN(read_format_bgra_DESKTOP) // Desktop differs +_EVASGL_EXT_BEGIN(read_format_bgra) // Desktop has it from GL 1.2 _EVASGL_EXT_DRVNAME(GL_EXT_read_format_bgra) _EVASGL_EXT_END() @@ -421,7 +417,7 @@ _EVASGL_EXT_BEGIN(texture_filter_anisotropic) _EVASGL_EXT_DRVNAME(GL_EXT_texture_filter_anisotropic) _EVASGL_EXT_END() -_EVASGL_EXT_BEGIN(texture_format_BGRA8888) +_EVASGL_EXT_BEGIN(texture_format_BGRA8888) // Desktop has it from GL 1.2 _EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888) _EVASGL_EXT_END() --
