summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-11-27 20:15:40 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-11-27 20:50:47 +0900
commit45374e25360500f31dd23b0ffcb341aeb26906f2 (patch)
treedbe417d81fdd571a8a24ab453145ab28d5621173
parent9be96f4b96f7f500c8047ca41f0c8b8aa6014e8e (diff)
Evas GL: Also add read bgra for desktop GL
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_ext.c7
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h8
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)
264 264
265#ifndef GL_GLES 265#ifndef GL_GLES
266 /* Add some extension strings that are always working on desktop GL */ 266 /* Add some extension strings that are always working on desktop GL */
267 strcat(_gl_ext_string, "GL_EXT_texture_format_BGRA8888 "); 267 static const char *desktop_exts =
268 strcat(_gl_ext_string_official, "GL_EXT_texture_format_BGRA8888 "); 268 "GL_EXT_read_format_bgra "
269 "GL_EXT_texture_format_BGRA8888";
270 strcpy(_gl_ext_string, desktop_exts);
271 strcpy(_gl_ext_string_official, desktop_exts);
269#endif 272#endif
270 273
271 ///////////////////////////////////////////////////////////////////////////////////////////////////// 274 /////////////////////////////////////////////////////////////////////////////////////////////////////
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)
409 _EVASGL_EXT_DRVNAME(GL_EXT_blend_minmax) 409 _EVASGL_EXT_DRVNAME(GL_EXT_blend_minmax)
410_EVASGL_EXT_END() 410_EVASGL_EXT_END()
411 411
412_EVASGL_EXT_BEGIN(read_format_bgra) // Desktop differs 412_EVASGL_EXT_BEGIN(read_format_bgra) // Desktop has it from GL 1.2
413 _EVASGL_EXT_DRVNAME(GL_EXT_read_format_bgra)
414_EVASGL_EXT_END()
415
416_EVASGL_EXT_BEGIN(read_format_bgra_DESKTOP) // Desktop differs
417 _EVASGL_EXT_DRVNAME(GL_EXT_read_format_bgra) 413 _EVASGL_EXT_DRVNAME(GL_EXT_read_format_bgra)
418_EVASGL_EXT_END() 414_EVASGL_EXT_END()
419 415
@@ -421,7 +417,7 @@ _EVASGL_EXT_BEGIN(texture_filter_anisotropic)
421 _EVASGL_EXT_DRVNAME(GL_EXT_texture_filter_anisotropic) 417 _EVASGL_EXT_DRVNAME(GL_EXT_texture_filter_anisotropic)
422_EVASGL_EXT_END() 418_EVASGL_EXT_END()
423 419
424_EVASGL_EXT_BEGIN(texture_format_BGRA8888) 420_EVASGL_EXT_BEGIN(texture_format_BGRA8888) // Desktop has it from GL 1.2
425 _EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888) 421 _EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888)
426_EVASGL_EXT_END() 422_EVASGL_EXT_END()
427 423