enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

Evas GL: Fix compilation warning, use func pointer 

GLES 3 support should be a runtime-only requirement, so
no direct call to a GLES3 function should appear in evas.
Use our dlsym() pointer instead.
This commit is contained in:
Jean-Philippe Andre 2016-05-26 20:08:04 +09:00
parent 6e487e93b8
commit 3d6ea827b9
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/evas/engines/gl_common/evas_gl_api.c
View File

@ -1617,6 +1617,8 @@ _evgl_glDrawBuffers(GLsizei n, const GLenum *bufs)
Eina_Bool target_is_fbo = EINA_FALSE; Eina_Bool target_is_fbo = EINA_FALSE;
unsigned int drawbuffer; unsigned int drawbuffer;
if (!_gles3_api.glDrawBuffers) return;
ctx = evas_gl_common_current_context_get(); ctx = evas_gl_common_current_context_get();
if (!ctx) if (!ctx)
{ {
@ -1626,7 +1628,7 @@ _evgl_glDrawBuffers(GLsizei n, const GLenum *bufs)
if (!bufs) if (!bufs)
{ {
glDrawBuffers(n, bufs); _gles3_api.glDrawBuffers(n, bufs);
return; return;
} }
@ -1643,7 +1645,7 @@ _evgl_glDrawBuffers(GLsizei n, const GLenum *bufs)
if (*bufs == GL_BACK) if (*bufs == GL_BACK)
{ {
drawbuffer = GL_COLOR_ATTACHMENT0; drawbuffer = GL_COLOR_ATTACHMENT0;
glDrawBuffers(n, &drawbuffer); _gles3_api.glDrawBuffers(n, &drawbuffer);
} }
else if ((*bufs & GL_COLOR_ATTACHMENT0) == GL_COLOR_ATTACHMENT0) else if ((*bufs & GL_COLOR_ATTACHMENT0) == GL_COLOR_ATTACHMENT0)
{ {
@ -1651,7 +1653,7 @@ _evgl_glDrawBuffers(GLsizei n, const GLenum *bufs)
} }
else else
{ {
glDrawBuffers(n, bufs); _gles3_api.glDrawBuffers(n, bufs);
} }
} }
else else
@ -1661,7 +1663,7 @@ _evgl_glDrawBuffers(GLsizei n, const GLenum *bufs)
} }
else else
{ {
glDrawBuffers(n, bufs); _gles3_api.glDrawBuffers(n, bufs);
} }
} }
@ -1671,6 +1673,8 @@ _evgl_glReadBuffer(GLenum src)
EVGL_Context *ctx; EVGL_Context *ctx;
Eina_Bool target_is_fbo = EINA_FALSE; Eina_Bool target_is_fbo = EINA_FALSE;
if (!_gles3_api.glReadBuffer) return;
ctx = evas_gl_common_current_context_get(); ctx = evas_gl_common_current_context_get();
if (!ctx) if (!ctx)
{ {
@ -1688,7 +1692,7 @@ _evgl_glReadBuffer(GLenum src)
{ {
if (src == GL_BACK) if (src == GL_BACK)
{ {
glReadBuffer(GL_COLOR_ATTACHMENT0); _gles3_api.glReadBuffer(GL_COLOR_ATTACHMENT0);
} }
else if((src & GL_COLOR_ATTACHMENT0) == GL_COLOR_ATTACHMENT0) else if((src & GL_COLOR_ATTACHMENT0) == GL_COLOR_ATTACHMENT0)
{ {
@ -1696,12 +1700,12 @@ _evgl_glReadBuffer(GLenum src)
} }
else else
{ {
glReadBuffer(src); _gles3_api.glReadBuffer(src);
} }
} }
else else
{ {
glReadBuffer(src); _gles3_api.glReadBuffer(src);
} }
} }