summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-11-27 19:47:41 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-11-27 20:50:47 +0900
commiteaefb7c04755fcab73f5867f8fe25b0007c7e90c (patch)
treebf720f5019a4987ddc591c77b82206269212dc4d
parentd8a4792612822d53e28a86f300e3c52ac9156aa4 (diff)
Evas GL: Always support BGRA8888 on desktop GL
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_ext.c12
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h6
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)
258 memset(_gl_ext_string, 0, MAX_EXTENSION_STRING_BUFFER); 258 memset(_gl_ext_string, 0, MAX_EXTENSION_STRING_BUFFER);
259 memset(_gl_ext_string_official, 0, MAX_EXTENSION_STRING_BUFFER); 259 memset(_gl_ext_string_official, 0, MAX_EXTENSION_STRING_BUFFER);
260 260
261#ifndef GL_GLES
262 /* Add some extension strings that are always working on desktop GL */
263 strcat(_gl_ext_string, "GL_EXT_texture_format_BGRA8888 ");
264 strcat(_gl_ext_string_official, "GL_EXT_texture_format_BGRA8888 ");
265#endif
266
267 /////////////////////////////////////////////////////////////////////////////////////////////////////
268
261#define FINDSYM(getproc, dst, sym) \ 269#define FINDSYM(getproc, dst, sym) \
262 if (getproc) { \ 270 if (getproc) { \
263 if (!dst) dst = (__typeof__(dst))getproc(sym); \ 271 if (!dst) dst = (__typeof__(dst))getproc(sym); \
@@ -348,10 +356,6 @@ re->info->info.screen);
348#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR 356#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
349 357
350#undef GETPROCADDR 358#undef GETPROCADDR
351 /////////////////////////////////////////////////////////////////////////////////////////////////////
352
353 _gl_ext_string[0] = 0;
354 _gl_ext_string_official[0] = 0;
355 359
356 ///////////////////////////////////////////////////////////////////////////////////////////////////// 360 /////////////////////////////////////////////////////////////////////////////////////////////////////
357 // Extension HEADER 361 // 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)
423 _EVASGL_EXT_DRVNAME(GL_EXT_texture_filter_anisotropic) 423 _EVASGL_EXT_DRVNAME(GL_EXT_texture_filter_anisotropic)
424_EVASGL_EXT_END() 424_EVASGL_EXT_END()
425 425
426_EVASGL_EXT_BEGIN(texture_format_BGRA8888) // Desktop differs 426_EVASGL_EXT_BEGIN(texture_format_BGRA8888)
427 _EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888)
428_EVASGL_EXT_END()
429
430_EVASGL_EXT_BEGIN(texture_format_BGRA8888_DESKTOP) // Desktop differs
431 _EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888) 427 _EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888)
432_EVASGL_EXT_END() 428_EVASGL_EXT_END()
433 429