jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=eaefb7c04755fcab73f5867f8fe25b0007c7e90c
commit eaefb7c04755fcab73f5867f8fe25b0007c7e90c
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Thu Nov 27 19:47:41 2014 +0900
Evas GL: Always support BGRA8888 on desktop GL
---
src/modules/evas/engines/gl_common/evas_gl_api_ext.c | 12 ++++++++----
src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h | 6 +-----
2 files changed, 9 insertions(+), 9 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 d19d2eb..5aaa085 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
@@ -258,6 +258,14 @@ evgl_api_ext_init(void *getproc, const char *glueexts)
memset(_gl_ext_string, 0, MAX_EXTENSION_STRING_BUFFER);
memset(_gl_ext_string_official, 0, MAX_EXTENSION_STRING_BUFFER);
+#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 ");
+#endif
+
+
/////////////////////////////////////////////////////////////////////////////////////////////////////
+
#define FINDSYM(getproc, dst, sym) \
if (getproc) { \
if (!dst) dst = (__typeof__(dst))getproc(sym); \
@@ -348,10 +356,6 @@ re->info->info.screen);
#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
#undef GETPROCADDR
-
/////////////////////////////////////////////////////////////////////////////////////////////////////
-
- _gl_ext_string[0] = 0;
- _gl_ext_string_official[0] = 0;
/////////////////////////////////////////////////////////////////////////////////////////////////////
// Extension HEADER
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 52f0c19..0f518ed 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
@@ -423,11 +423,7 @@ _EVASGL_EXT_BEGIN(texture_filter_anisotropic)
_EVASGL_EXT_DRVNAME(GL_EXT_texture_filter_anisotropic)
_EVASGL_EXT_END()
-_EVASGL_EXT_BEGIN(texture_format_BGRA8888) // Desktop differs
- _EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888)
-_EVASGL_EXT_END()
-
-_EVASGL_EXT_BEGIN(texture_format_BGRA8888_DESKTOP) // Desktop differs
+_EVASGL_EXT_BEGIN(texture_format_BGRA8888)
_EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888)
_EVASGL_EXT_END()
--
