kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas GL: Fix up some more desktop GL extensions 

OpenGL 1.2 already supports some of the features that
GLESv2 has as extensions:
- GL_EXT_read_format_bgra
- GL_EXT_texture_format_BGRA8888
- GL_EXT_texture_type_2_10_10_10_REV

Also, we need to check the proper ARB name of some extensions when
running on desktop, instead of their OES/IMG/EXT equivalent:
- GL_ARB_texture_float
- GL_ARB_texture_half_float
- GL_ARB_texture_non_power_of_two
- GL_ARB_half_float_vertex
- GL_EXT_packed_depth_stencil
This commit is contained in:
Jean-Philippe Andre 2014-11-27 20:46:10 +09:00
parent 45374e2536
commit 02d123be77
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/evas/engines/gl_common/evas_gl_api_ext.c
View File

@ -266,7 +266,8 @@ evgl_api_ext_init(void *getproc, const char *glueexts)
/* Add some extension strings that are always working on desktop GL */
static const char *desktop_exts =
"GL_EXT_read_format_bgra "
"GL_EXT_texture_format_BGRA8888";
"GL_EXT_texture_format_BGRA8888 "
"GL_EXT_texture_type_2_10_10_10_REV ";
strcpy(_gl_ext_string, desktop_exts);
strcpy(_gl_ext_string_official, desktop_exts);
#endif

18
src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h
View File

@ -342,6 +342,7 @@ _EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(packed_depth_stencil)
_EVASGL_EXT_DRVNAME(GL_OES_packed_depth_stencil)
_EVASGL_EXT_DRVNAME_DESKTOP("GL_EXT_packed_depth_stencil")
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(rgb8_rgba8)
@ -362,18 +363,22 @@ _EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(texture_float)
_EVASGL_EXT_DRVNAME(GL_OES_texture_float)
_EVASGL_EXT_DRVNAME_DESKTOP("GL_ARB_texture_float")
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(texture_half_float)
_EVASGL_EXT_DRVNAME(GL_OES_texture_half_float)
_EVASGL_EXT_DRVNAME_DESKTOP("GL_ARB_texture_half_float")
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(texture_float_linear)
_EVASGL_EXT_DRVNAME(GL_OES_texture_float_linear)
// _EVASGL_EXT_DRVNAME_DESKTOP("GL_ARB_texture_float_linear")
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(texture_half_float_linear)
_EVASGL_EXT_DRVNAME(GL_OES_texture_half_float_linear)
// _EVASGL_EXT_DRVNAME_DESKTOP("GL_ARB_texture_half_float_linear")
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(texture_npot)
@ -381,12 +386,9 @@ _EVASGL_EXT_BEGIN(texture_npot)
_EVASGL_EXT_DRVNAME_DESKTOP("GL_ARB_texture_non_power_of_two")
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(vertex_half_float) // Desktop differs
_EVASGL_EXT_DRVNAME(GL_OES_vertex_half_float)
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(vertex_half_float_DESKTOP) // Desktop differs
_EVASGL_EXT_BEGIN(vertex_half_float)
_EVASGL_EXT_DRVNAME(GL_OES_vertex_half_float)
_EVASGL_EXT_DRVNAME_DESKTOP("GL_ARB_half_float_vertex")
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(vertex_type_10_10_10_2)
@ -421,11 +423,7 @@ _EVASGL_EXT_BEGIN(texture_format_BGRA8888) // Desktop has it from GL 1.2
_EVASGL_EXT_DRVNAME(GL_EXT_texture_format_BGRA8888)
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(texture_type_2_10_10_10_rev) // Desktop differs
_EVASGL_EXT_DRVNAME(GL_EXT_texture_type_2_10_10_10_REV)
_EVASGL_EXT_END()
_EVASGL_EXT_BEGIN(texture_type_2_10_10_10_rev_DESKTOP) // Desktop differs
_EVASGL_EXT_BEGIN(texture_type_2_10_10_10_rev) // Desktop has it from GL 1.2
_EVASGL_EXT_DRVNAME(GL_EXT_texture_type_2_10_10_10_REV)
_EVASGL_EXT_END()