jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=af37cc2be463ab17f4f358025b624c931598706c

commit af37cc2be463ab17f4f358025b624c931598706c
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Tue Aug 18 17:59:21 2015 +0900

    Evas GL: Simplify previous commit
    
    Also generate the debug functions for GLES 3
---
 src/modules/evas/engines/gl_common/evas_gl_api.c   | 912 +--------------------
 .../evas/engines/gl_common/evas_gl_api_gles3_def.h | 182 ++--
 2 files changed, 136 insertions(+), 958 deletions(-)

diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c 
b/src/modules/evas/engines/gl_common/evas_gl_api.c
index b8c7240..a20eb52 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -1000,9 +1000,16 @@ _evgl_glViewport(GLint x, GLint y, GLsizei width, 
GLsizei height)
 
 // Open GLES 2.0 APIs
 #define _EVASGL_FUNCTION_PRIVATE_BEGIN(ret, name, param1, param2) \
-   static ret evgl_##name param1 { EVGL_FUNC_BEGIN(); return _evgl_##name 
param2; }
+static ret evgl_##name param1 { \
+   EVGL_FUNC_BEGIN(); \
+   return _evgl_##name param2; \
+}
+
 #define _EVASGL_FUNCTION_BEGIN(ret, name, param1, param2) \
-   static ret evgl_##name param1 { EVGL_FUNC_BEGIN(); return name param2; }
+static ret evgl_##name param1 { \
+   EVGL_FUNC_BEGIN(); \
+   return name param2; \
+}
 
 #include "evas_gl_api_def.h"
 
@@ -1011,15 +1018,47 @@ _evgl_glViewport(GLint x, GLint y, GLsizei width, 
GLsizei height)
 
 //-------------------------------------------------------------//
 // Open GLES 3.0 APIs
-//#define _CHECK_NULL(ret, name) if (!_gles3_api.##name) return (ret)0
 #define _EVASGL_FUNCTION_BEGIN(ret, name, param1, param2) \
-   static ret evgl_gles3_##name param1 {\
-    if (!_gles3_api.name) return (ret)0;\
-    return _gles3_api.name param2; }
+static ret evgl_gles3_##name param1 { \
+   if (!_gles3_api.name) return (ret)0; \
+   return _gles3_api.name param2; \
+}
+
+#define _EVASGL_FUNCTION_BEGIN_VOID(name, param1, param2) \
+static void evgl_gles3_##name param1 { \
+   if (!_gles3_api.name) return; \
+   _gles3_api.name param2; \
+}
+
+#include "evas_gl_api_gles3_def.h"
+
+#undef _EVASGL_FUNCTION_BEGIN
+#undef _EVASGL_FUNCTION_BEGIN_VOID
+
+
+//-------------------------------------------------------------//
+// Open GLES 3.0 APIs DEBUG
+#define _EVASGL_FUNCTION_BEGIN(ret, name, param1, param2) \
+static ret _evgld_##name param1 { \
+   EVGLD_FUNC_BEGIN(); \
+   if (!_gles3_api.name) return (ret)0; \
+   ret a = _gles3_api.name param2; \
+   EVGLD_FUNC_END(); \
+   return a; \
+}
+
+#define _EVASGL_FUNCTION_BEGIN_VOID(name, param1, param2) \
+static void _evgld_##name param1 { \
+   EVGLD_FUNC_BEGIN(); \
+   if (!_gles3_api.name) return; \
+   _gles3_api.name param2; \
+   EVGLD_FUNC_END(); \
+}
 
 #include "evas_gl_api_gles3_def.h"
 
 #undef _EVASGL_FUNCTION_BEGIN
+#undef _EVASGL_FUNCTION_BEGIN_VOID
 
 //-------------------------------------------------------------//
 // Debug Evas GL APIs
@@ -2142,867 +2181,6 @@ _evgld_glVertexAttribPointer(GLuint indx, GLint size, 
GLenum type, GLboolean nor
 }
 
 //-------------------------------------------------------------//
-// Open GLES 3.0 APIs
-
-void
-_evgld_glReadBuffer(GLenum mode)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glReadBuffer(mode);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei 
count, GLenum type, const GLvoid *indices)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDrawRangeElements(mode, start, end, count, type, indices);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei 
width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, 
const GLvoid *pixels)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glTexImage3D(target, level, internalformat, width, height, 
depth, border, format, type, pixels);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint 
yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum 
format, GLenum type, const GLvoid *pixels)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, 
height, depth, format, type, pixels);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint 
yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, 
y, width, height);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glCompressedTexImage3D(GLenum target, GLint level, GLenum 
internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, 
GLsizei imageSize, const GLvoid *data)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glCompressedTexImage3D(target, level, internalformat, width, 
height, depth, border, imageSize, data);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, 
GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, 
GLenum format, GLsizei imageSize, const GLvoid *data)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glCompressedTexSubImage3D(target, level, xoffset, yoffset, 
zoffset, width, height, depth, format, imageSize, data);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGenQueries(GLsizei n, GLuint *ids)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGenQueries(n, ids);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glDeleteQueries(GLsizei n, const GLuint *ids)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDeleteQueries(n, ids);
-   EVGLD_FUNC_END();
-}
-
-GLboolean
- _evgld_glIsQuery(GLuint id)
-{
-   GLboolean ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glIsQuery(id);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glBeginQuery(GLenum target, GLuint id)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glBeginQuery(target, id);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glEndQuery(GLenum target)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glEndQuery(target);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetQueryiv(GLenum target, GLenum pname, GLint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetQueryiv(target, pname, params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetQueryObjectuiv(id, pname, params);
-   EVGLD_FUNC_END();
-}
-
-GLboolean
-_evgld_glUnmapBuffer(GLenum target)
-{
-   GLboolean ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glUnmapBuffer(target);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glGetBufferPointerv(GLenum target, GLenum pname, GLvoid **params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetBufferPointerv(target, pname, params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glDrawBuffers(GLsizei n, const GLenum *bufs)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDrawBuffers(n, bufs);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean 
transpose, const GLfloat *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniformMatrix2x3fv(location, count, transpose, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean 
transpose, const GLfloat *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniformMatrix3x2fv(location, count, transpose, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean 
transpose, const GLfloat *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniformMatrix2x4fv(location, count, transpose, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean 
transpose, const GLfloat *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniformMatrix4x2fv(location, count, transpose, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean 
transpose, const GLfloat *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniformMatrix3x4fv(location, count, transpose, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean 
transpose, const GLfloat *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniformMatrix4x3fv(location, count, transpose, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, 
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum 
filter)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, 
dstX1, dstY1, mask, filter);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum 
internalformat, GLsizei width, GLsizei height)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glRenderbufferStorageMultisample(target, samples, 
internalformat, width, height);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint 
texture, GLint level, GLint layer)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glFramebufferTextureLayer(target, attachment, texture, level, 
layer);
-   EVGLD_FUNC_END();
-}
-
-void *
-_evgld_glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, 
GLbitfield access)
-{
-   void* ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glMapBufferRange(target, offset, length, access);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-GLsync
-_evgld_glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr 
length)
-{
-   GLsync ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glFlushMappedBufferRange(target, offset, length);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glBindVertexArray(GLuint array)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glBindVertexArray(array);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDeleteVertexArrays(n, arrays);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGenVertexArrays(GLsizei n, GLuint *arrays)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGenVertexArrays(n, arrays);
-   EVGLD_FUNC_END();
-}
-
-GLboolean
-_evgld_glIsVertexArray(GLuint array)
-{
-   GLboolean ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glIsVertexArray(array);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetIntegeri_v(target, index, data);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glBeginTransformFeedback(GLenum primitiveMode)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glBeginTransformFeedback(primitiveMode);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glEndTransformFeedback(void)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glEndTransformFeedback();
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr 
offset, GLsizeiptr size)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glBindBufferRange(target, index, buffer, offset, size);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glBindBufferBase(target, index, buffer);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar 
*const*varyings, GLenum bufferMode)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glTransformFeedbackVaryings(program, count, varyings, 
bufferMode);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei 
bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetTransformFeedbackVarying(program, index, bufSize, length, 
size, type, name);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei 
stride, const GLvoid *pointer)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glVertexAttribIPointer(index, size, type, stride, pointer);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetVertexAttribIiv(index, pname, params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetVertexAttribIuiv(index, pname, params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glVertexAttribI4i(index, x, y, z,  w);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glVertexAttribI4ui(index, x, y, z, w);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glVertexAttribI4iv(GLuint index, const GLint *v)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glVertexAttribI4iv(index, v);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glVertexAttribI4uiv(GLuint index, const GLuint *v)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glVertexAttribI4uiv(index, v);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetUniformuiv(GLuint program, GLint location, GLuint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetUniformuiv(program, location, params);
-   EVGLD_FUNC_END();
-}
-
-GLint
-_evgld_glGetFragDataLocation(GLuint program, const GLchar *name)
-{
-   GLint ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glGetFragDataLocation(program, name);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glUniform1ui(GLint location, GLuint v0)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniform1ui(location, v0);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniform2ui(GLint location, GLuint v0, GLuint v1)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniform2ui(location, v0, v1);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniform3ui(location, v0, v1, v2);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniform4ui(location, v0, v1, v2, v3);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniform1uiv(location, count, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniform2uiv(location, count, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniform3uiv(location, count, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniform4uiv(location, count, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glClearBufferiv(buffer, drawbuffer, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glClearBufferuiv(buffer, drawbuffer, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glClearBufferfv(buffer, drawbuffer, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint 
stencil)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glClearBufferfi(buffer, drawbuffer, depth, stencil);
-   EVGLD_FUNC_END();
-}
-
-const GLubyte *
- _evgld_glGetStringi(GLenum name, GLuint index)
-{
-   const GLubyte *ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glGetStringi(name, index);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr 
readOffset, GLintptr writeOffset, GLsizeiptr size)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glCopyBufferSubData(readTarget, writeTarget, readOffset, 
writeOffset, size);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar 
*const*uniformNames, GLuint *uniformIndices)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetUniformIndices(program, uniformCount, 
uniformNames,uniformIndices);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const 
GLuint *uniformIndices, GLenum pname, GLint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetActiveUniformsiv(program, uniformCount, uniformIndices, 
pname, params);
-   EVGLD_FUNC_END();
-}
-
-GLuint
-_evgld_glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
-{
-   GLuint ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glGetUniformBlockIndex(program, uniformBlockName);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, 
GLenum pname, GLint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetActiveUniformBlockiv(program, uniformBlockIndex, pname, 
params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, 
GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetActiveUniformBlockName(program, uniformBlockIndex, bufSize, 
length, uniformBlockName);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint 
uniformBlockBinding)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glUniformBlockBinding(program, uniformBlockIndex, 
uniformBlockBinding);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei 
instancecount)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDrawArraysInstanced(mode, first, count, instancecount);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const 
GLvoid *indices, GLsizei instancecount)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDrawElementsInstanced(mode, count, type, indices, 
instancecount);
-   EVGLD_FUNC_END();
-}
-
-GLsync
-_evgld_glFenceSync(GLenum condition, GLbitfield flags)
-{
-   GLsync ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glFenceSync(condition, flags);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-GLboolean
-_evgld_glIsSync(GLsync sync)
-{
-   GLboolean ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glIsSync(sync);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glDeleteSync(GLsync sync)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDeleteSync(sync);
-   EVGLD_FUNC_END();
-}
-
-GLenum
-_evgld_glClientWaitSync(GLsync sync, GLbitfield flags, EvasGLuint64 timeout)
-{
-   GLenum ret;
-   EVGLD_FUNC_BEGIN();
-   ret =  evgl_gles3_glClientWaitSync(sync, flags, timeout);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glWaitSync(GLsync sync, GLbitfield flags, EvasGLuint64 timeout)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glWaitSync(sync, flags, timeout);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetInteger64v(GLenum pname, EvasGLint64 *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetInteger64v(pname, params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei 
*length, GLint *values)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetSynciv(sync, pname, bufSize, length, values);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetInteger64i_v(GLenum target, GLuint index, EvasGLint64 *data)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetInteger64i_v(target, index, data);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetBufferParameteri64v(GLenum target, GLenum pname, EvasGLint64 
*params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetBufferParameteri64v(target, pname, params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGenSamplers(GLsizei count, GLuint *samplers)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGenSamplers(count, samplers);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glDeleteSamplers(GLsizei count, const GLuint *samplers)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDeleteSamplers(count, samplers);
-   EVGLD_FUNC_END();
-}
-
-GLboolean
-_evgld_glIsSampler(GLuint sampler)
-{
-   GLboolean ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glIsSampler(sampler);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glBindSampler(GLuint unit, GLuint sampler)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glBindSampler(unit, sampler);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glSamplerParameteri(sampler, pname, param);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glSamplerParameteriv(sampler, pname, param);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glSamplerParameterf(sampler, pname, param);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glSamplerParameterfv(sampler, pname, param);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetSamplerParameteriv(sampler, pname, params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetSamplerParameterfv(sampler, pname, params);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glVertexAttribDivisor(GLuint index, GLuint divisor)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glVertexAttribDivisor(index, divisor);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glBindTransformFeedback(GLenum target, GLuint id)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glBindTransformFeedback(target, id);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glDeleteTransformFeedbacks(n, ids);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGenTransformFeedbacks(GLsizei n, GLuint *ids)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGenTransformFeedbacks(n, ids);
-   EVGLD_FUNC_END();
-}
-
-GLboolean
-_evgld_glIsTransformFeedback(GLuint id)
-{
-   GLboolean ret;
-   EVGLD_FUNC_BEGIN();
-   ret = evgl_gles3_glIsTransformFeedback(id);
-   EVGLD_FUNC_END();
-   return ret;
-}
-
-void
-_evgld_glPauseTransformFeedback(void)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glPauseTransformFeedback();
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glResumeTransformFeedback(void)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glResumeTransformFeedback();
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, 
GLenum *binaryFormat, GLvoid *binary)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetProgramBinary(program, bufSize, length, binaryFormat, 
binary);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid 
*binary, GLsizei length)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glProgramBinary(program, binaryFormat, binary, length);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glProgramParameteri(GLuint program, GLenum pname, GLint value)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glProgramParameteri(program, pname, value);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const 
GLenum *attachments)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glInvalidateFramebuffer(target, numAttachments, attachments);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const 
GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glInvalidateSubFramebuffer(target, numAttachments, attachments, 
x, y, width, height);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, 
GLsizei width, GLsizei height)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glTexStorage2D(target, levels, internalformat, width, height);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, 
GLsizei width, GLsizei height, GLsizei depth)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glTexStorage3D(target, levels, internalformat, width, height, 
depth);
-   EVGLD_FUNC_END();
-}
-
-void
-_evgld_glGetInternalformativ(GLenum target, GLenum internalformat, GLenum 
pname, GLsizei bufSize, GLint *params)
-{
-   EVGLD_FUNC_BEGIN();
-   evgl_gles3_glGetInternalformativ(target, internalformat, pname, bufSize, 
params);
-   EVGLD_FUNC_END();
-}
-
-//-------------------------------------------------------------//
 // Calls for stripping precision string in the shader
 #if 0
 
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_gles3_def.h 
b/src/modules/evas/engines/gl_common/evas_gl_api_gles3_def.h
index 92ad746..c421b8c 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api_gles3_def.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_gles3_def.h
@@ -1,104 +1,104 @@
-_EVASGL_FUNCTION_BEGIN(void, glBeginQuery, (GLenum target, GLuint id), 
(target, id))
-_EVASGL_FUNCTION_BEGIN(void, glBeginTransformFeedback, (GLenum primitiveMode), 
(primitiveMode))
-_EVASGL_FUNCTION_BEGIN(void, glBindBufferBase, (GLenum target, GLuint index, 
GLuint buffer), (target, index, buffer))
-_EVASGL_FUNCTION_BEGIN(void, glBindBufferRange, (GLenum target, GLuint index, 
GLuint buffer, GLintptr offset, GLsizeiptr size), (target, index, buffer, 
offset, size))
-_EVASGL_FUNCTION_BEGIN(void, glBindSampler, (GLuint unit, GLuint sampler), 
(unit, sampler))
-_EVASGL_FUNCTION_BEGIN(void, glBindTransformFeedback, (GLenum target, GLuint 
id), (target, id))
-_EVASGL_FUNCTION_BEGIN(void, glBindVertexArray, (GLuint array), (array))
-_EVASGL_FUNCTION_BEGIN(void, glBlitFramebuffer, (GLint srcX0, GLint srcY0, 
GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, 
GLbitfield mask, GLenum filter), (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, 
dstX1, dstY1, mask, filter))
-_EVASGL_FUNCTION_BEGIN(void, glClearBufferfi, (GLenum buffer, GLint 
drawBuffer, GLfloat depth, GLint stencil), (buffer, drawBuffer, depth, stencil))
-_EVASGL_FUNCTION_BEGIN(void, glClearBufferfv, (GLenum buffer, GLint 
drawBuffer, const GLfloat * value), (buffer, drawBuffer, value))
-_EVASGL_FUNCTION_BEGIN(void, glClearBufferiv, (GLenum buffer, GLint 
drawBuffer, const GLint * value), (buffer, drawBuffer, value))
-_EVASGL_FUNCTION_BEGIN(void, glClearBufferuiv, (GLenum buffer, GLint 
drawBuffer, const GLuint * value), (buffer, drawBuffer, value))
+_EVASGL_FUNCTION_BEGIN_VOID( glBeginQuery, (GLenum target, GLuint id), 
(target, id))
+_EVASGL_FUNCTION_BEGIN_VOID( glBeginTransformFeedback, (GLenum primitiveMode), 
(primitiveMode))
+_EVASGL_FUNCTION_BEGIN_VOID( glBindBufferBase, (GLenum target, GLuint index, 
GLuint buffer), (target, index, buffer))
+_EVASGL_FUNCTION_BEGIN_VOID( glBindBufferRange, (GLenum target, GLuint index, 
GLuint buffer, GLintptr offset, GLsizeiptr size), (target, index, buffer, 
offset, size))
+_EVASGL_FUNCTION_BEGIN_VOID( glBindSampler, (GLuint unit, GLuint sampler), 
(unit, sampler))
+_EVASGL_FUNCTION_BEGIN_VOID( glBindTransformFeedback, (GLenum target, GLuint 
id), (target, id))
+_EVASGL_FUNCTION_BEGIN_VOID( glBindVertexArray, (GLuint array), (array))
+_EVASGL_FUNCTION_BEGIN_VOID( glBlitFramebuffer, (GLint srcX0, GLint srcY0, 
GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, 
GLbitfield mask, GLenum filter), (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, 
dstX1, dstY1, mask, filter))
+_EVASGL_FUNCTION_BEGIN_VOID( glClearBufferfi, (GLenum buffer, GLint 
drawBuffer, GLfloat depth, GLint stencil), (buffer, drawBuffer, depth, stencil))
+_EVASGL_FUNCTION_BEGIN_VOID( glClearBufferfv, (GLenum buffer, GLint 
drawBuffer, const GLfloat * value), (buffer, drawBuffer, value))
+_EVASGL_FUNCTION_BEGIN_VOID( glClearBufferiv, (GLenum buffer, GLint 
drawBuffer, const GLint * value), (buffer, drawBuffer, value))
+_EVASGL_FUNCTION_BEGIN_VOID( glClearBufferuiv, (GLenum buffer, GLint 
drawBuffer, const GLuint * value), (buffer, drawBuffer, value))
 _EVASGL_FUNCTION_BEGIN(GLenum, glClientWaitSync, (GLsync sync, GLbitfield 
flags, EvasGLuint64 timeout), (sync, flags, timeout))
-_EVASGL_FUNCTION_BEGIN(void, glCompressedTexImage3D, (GLenum target, GLint 
level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, 
GLint border, GLsizei imageSize, const GLvoid * data), (target, level, 
internalformat, width, height, depth, border, imageSize, data))
-_EVASGL_FUNCTION_BEGIN(void, glCompressedTexSubImage3D, (GLenum target, GLint 
level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei 
height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data), 
(target, level, xoffset, yoffset, zoffset, width, height, depth, format, 
imageSize, data))
-_EVASGL_FUNCTION_BEGIN(void, glCopyBufferSubData, (GLenum readtarget, GLenum 
writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size), 
(readtarget, writetarget, readoffset, writeoffset, size))
-_EVASGL_FUNCTION_BEGIN(void, glCopyTexSubImage3D, (GLenum target, GLint level, 
GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, 
GLsizei height), (target, level, xoffset, yoffset, zoffset, x, y, width, 
height))
-_EVASGL_FUNCTION_BEGIN(void, glDeleteQueries, (GLsizei n, const GLuint * ids), 
(n, ids))
-_EVASGL_FUNCTION_BEGIN(void, glDeleteSamplers, (GLsizei n, const GLuint * 
samplers), (n, samplers))
-_EVASGL_FUNCTION_BEGIN(void, glDeleteSync, (GLsync sync), (sync))
-_EVASGL_FUNCTION_BEGIN(void, glDeleteTransformFeedbacks, (GLsizei n, const 
GLuint *ids), (n, ids))
-_EVASGL_FUNCTION_BEGIN(void, glDeleteVertexArrays, (GLsizei n, const GLuint 
*arrays), (n, arrays))
-_EVASGL_FUNCTION_BEGIN(void, glDrawArraysInstanced, (GLenum mode, GLint first, 
GLsizei count, GLsizei primcount), (mode, first, count, primcount))
-_EVASGL_FUNCTION_BEGIN(void, glDrawBuffers, (GLsizei n, const GLenum *bufs), 
(n, bufs))
-_EVASGL_FUNCTION_BEGIN(void, glDrawElementsInstanced, (GLenum mode, GLsizei 
count, GLenum type, const void * indices, GLsizei primcount), (mode, count, 
type, indices, primcount))
-_EVASGL_FUNCTION_BEGIN(void, glDrawRangeElements, (GLenum mode, GLuint start, 
GLuint end, GLsizei count, GLenum type, const GLvoid * indices), (mode, start, 
end, count, type, indices))
-_EVASGL_FUNCTION_BEGIN(void, glEndQuery, (GLenum target), (target))
-_EVASGL_FUNCTION_BEGIN(void, glEndTransformFeedback, (void), ())
+_EVASGL_FUNCTION_BEGIN_VOID( glCompressedTexImage3D, (GLenum target, GLint 
level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, 
GLint border, GLsizei imageSize, const GLvoid * data), (target, level, 
internalformat, width, height, depth, border, imageSize, data))
+_EVASGL_FUNCTION_BEGIN_VOID( glCompressedTexSubImage3D, (GLenum target, GLint 
level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei 
height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data), 
(target, level, xoffset, yoffset, zoffset, width, height, depth, format, 
imageSize, data))
+_EVASGL_FUNCTION_BEGIN_VOID( glCopyBufferSubData, (GLenum readtarget, GLenum 
writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size), 
(readtarget, writetarget, readoffset, writeoffset, size))
+_EVASGL_FUNCTION_BEGIN_VOID( glCopyTexSubImage3D, (GLenum target, GLint level, 
GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, 
GLsizei height), (target, level, xoffset, yoffset, zoffset, x, y, width, 
height))
+_EVASGL_FUNCTION_BEGIN_VOID( glDeleteQueries, (GLsizei n, const GLuint * ids), 
(n, ids))
+_EVASGL_FUNCTION_BEGIN_VOID( glDeleteSamplers, (GLsizei n, const GLuint * 
samplers), (n, samplers))
+_EVASGL_FUNCTION_BEGIN_VOID( glDeleteSync, (GLsync sync), (sync))
+_EVASGL_FUNCTION_BEGIN_VOID( glDeleteTransformFeedbacks, (GLsizei n, const 
GLuint *ids), (n, ids))
+_EVASGL_FUNCTION_BEGIN_VOID( glDeleteVertexArrays, (GLsizei n, const GLuint 
*arrays), (n, arrays))
+_EVASGL_FUNCTION_BEGIN_VOID( glDrawArraysInstanced, (GLenum mode, GLint first, 
GLsizei count, GLsizei primcount), (mode, first, count, primcount))
+_EVASGL_FUNCTION_BEGIN_VOID( glDrawBuffers, (GLsizei n, const GLenum *bufs), 
(n, bufs))
+_EVASGL_FUNCTION_BEGIN_VOID( glDrawElementsInstanced, (GLenum mode, GLsizei 
count, GLenum type, const void * indices, GLsizei primcount), (mode, count, 
type, indices, primcount))
+_EVASGL_FUNCTION_BEGIN_VOID( glDrawRangeElements, (GLenum mode, GLuint start, 
GLuint end, GLsizei count, GLenum type, const GLvoid * indices), (mode, start, 
end, count, type, indices))
+_EVASGL_FUNCTION_BEGIN_VOID( glEndQuery, (GLenum target), (target))
+_EVASGL_FUNCTION_BEGIN_VOID( glEndTransformFeedback, (void), ())
 _EVASGL_FUNCTION_BEGIN(GLsync, glFenceSync, (GLenum condition, GLbitfield 
flags), (condition, flags))
 _EVASGL_FUNCTION_BEGIN(GLsync, glFlushMappedBufferRange, (GLenum target, 
GLintptr offset, GLsizeiptr length), (target, offset, length))
-_EVASGL_FUNCTION_BEGIN(void, glFramebufferTextureLayer, (GLenum target, GLenum 
attachment, GLuint texture, GLint level, GLint layer), (target, attachment, 
texture, level, layer))
-_EVASGL_FUNCTION_BEGIN(void, glGenQueries, (GLsizei n, GLuint * ids), (n, ids))
-_EVASGL_FUNCTION_BEGIN(void, glGenSamplers, (GLsizei n, GLuint *samplers), (n, 
samplers))
-_EVASGL_FUNCTION_BEGIN(void, glGenTransformFeedbacks, (GLsizei n, GLuint 
*ids), (n, ids))
-_EVASGL_FUNCTION_BEGIN(void, glGenVertexArrays, (GLsizei n, GLuint *arrays), 
(n, arrays))
-_EVASGL_FUNCTION_BEGIN(void, glGetActiveUniformBlockiv, (GLuint program, 
GLuint uniformBlockIndex, GLenum pname, GLint *params), (program, 
uniformBlockIndex, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glGetActiveUniformBlockName, (GLuint program, 
GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar 
*uniformBlockName), (program, uniformBlockIndex, bufSize, length, 
uniformBlockName))
-_EVASGL_FUNCTION_BEGIN(void, glGetActiveUniformsiv, (GLuint program, GLsizei 
uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params), 
(program, uniformCount, uniformIndices, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glGetBufferParameteri64v, (GLenum target, GLenum 
value, EvasGLint64 * data), (target, value, data))
-_EVASGL_FUNCTION_BEGIN(void, glGetBufferPointerv, (GLenum target, GLenum 
pname, GLvoid ** params), (target, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glFramebufferTextureLayer, (GLenum target, GLenum 
attachment, GLuint texture, GLint level, GLint layer), (target, attachment, 
texture, level, layer))
+_EVASGL_FUNCTION_BEGIN_VOID( glGenQueries, (GLsizei n, GLuint * ids), (n, ids))
+_EVASGL_FUNCTION_BEGIN_VOID( glGenSamplers, (GLsizei n, GLuint *samplers), (n, 
samplers))
+_EVASGL_FUNCTION_BEGIN_VOID( glGenTransformFeedbacks, (GLsizei n, GLuint 
*ids), (n, ids))
+_EVASGL_FUNCTION_BEGIN_VOID( glGenVertexArrays, (GLsizei n, GLuint *arrays), 
(n, arrays))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetActiveUniformBlockiv, (GLuint program, 
GLuint uniformBlockIndex, GLenum pname, GLint *params), (program, 
uniformBlockIndex, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetActiveUniformBlockName, (GLuint program, 
GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar 
*uniformBlockName), (program, uniformBlockIndex, bufSize, length, 
uniformBlockName))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetActiveUniformsiv, (GLuint program, GLsizei 
uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params), 
(program, uniformCount, uniformIndices, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetBufferParameteri64v, (GLenum target, GLenum 
value, EvasGLint64 * data), (target, value, data))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetBufferPointerv, (GLenum target, GLenum 
pname, GLvoid ** params), (target, pname, params))
 _EVASGL_FUNCTION_BEGIN(GLint, glGetFragDataLocation, (GLuint program, const 
char * name), (program,  name))
-_EVASGL_FUNCTION_BEGIN(void, glGetInteger64i_v, (GLenum target, GLuint index, 
EvasGLint64 * data), (target, index, data))
-_EVASGL_FUNCTION_BEGIN(void, glGetInteger64v, (GLenum pname, EvasGLint64 * 
data), (pname, data))
-_EVASGL_FUNCTION_BEGIN(void, glGetIntegeri_v, (GLenum target, GLuint index, 
GLint * data), (target, index, data))
-_EVASGL_FUNCTION_BEGIN(void, glGetInternalformativ, (GLenum target, GLenum 
internalformat, GLenum pname, GLsizei bufSize, GLint *params), (target, 
internalformat, pname, bufSize, params))
-_EVASGL_FUNCTION_BEGIN(void, glGetProgramBinary, (GLuint program, GLsizei 
bufsize, GLsizei *length, GLenum *binaryFormat, void *binary), (program, 
bufsize, length, binaryFormat, binary))
-_EVASGL_FUNCTION_BEGIN(void, glGetQueryiv, (GLenum target, GLenum pname, GLint 
* params), (target, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glGetQueryObjectuiv, (GLuint id, GLenum pname, 
GLuint * params), (id, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glGetSamplerParameterfv, (GLuint sampler, GLenum 
pname, GLfloat * params), (sampler, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glGetSamplerParameteriv, (GLuint sampler, GLenum 
pname, GLint * params), (sampler, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetInteger64i_v, (GLenum target, GLuint index, 
EvasGLint64 * data), (target, index, data))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetInteger64v, (GLenum pname, EvasGLint64 * 
data), (pname, data))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetIntegeri_v, (GLenum target, GLuint index, 
GLint * data), (target, index, data))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetInternalformativ, (GLenum target, GLenum 
internalformat, GLenum pname, GLsizei bufSize, GLint *params), (target, 
internalformat, pname, bufSize, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetProgramBinary, (GLuint program, GLsizei 
bufsize, GLsizei *length, GLenum *binaryFormat, void *binary), (program, 
bufsize, length, binaryFormat, binary))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetQueryiv, (GLenum target, GLenum pname, GLint 
* params), (target, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetQueryObjectuiv, (GLuint id, GLenum pname, 
GLuint * params), (id, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetSamplerParameterfv, (GLuint sampler, GLenum 
pname, GLfloat * params), (sampler, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetSamplerParameteriv, (GLuint sampler, GLenum 
pname, GLint * params), (sampler, pname, params))
 _EVASGL_FUNCTION_BEGIN(const GLubyte *, glGetStringi, (GLenum name, GLuint 
index), (name, index))
-_EVASGL_FUNCTION_BEGIN(void, glGetSynciv, (GLsync sync, GLenum pname, GLsizei 
bufSize, GLsizei *length, GLint *values), (sync, pname, bufSize, length, 
values))
-_EVASGL_FUNCTION_BEGIN(void, glGetTransformFeedbackVarying, (GLuint program, 
GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, 
char * name), (program, index, bufSize, length, size, type, name))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetSynciv, (GLsync sync, GLenum pname, GLsizei 
bufSize, GLsizei *length, GLint *values), (sync, pname, bufSize, length, 
values))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetTransformFeedbackVarying, (GLuint program, 
GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, 
char * name), (program, index, bufSize, length, size, type, name))
 _EVASGL_FUNCTION_BEGIN(GLuint, glGetUniformBlockIndex, (GLuint program, const 
GLchar *uniformBlockName), (program, uniformBlockName))
-_EVASGL_FUNCTION_BEGIN(void, glGetUniformIndices, (GLuint program, GLsizei 
uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices), 
(program, uniformCount, uniformNames, uniformIndices))
-_EVASGL_FUNCTION_BEGIN(void, glGetUniformuiv, (GLuint program, GLint location, 
GLuint* params), (program, location, params))
-_EVASGL_FUNCTION_BEGIN(void, glGetVertexAttribIiv, (GLuint index, GLenum 
pname, GLint *params), (index, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glGetVertexAttribIuiv, (GLuint index, GLenum 
pname, GLuint *params), (index, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glInvalidateFramebuffer, (GLenum target, GLsizei 
numAttachments, const GLenum *attachments), (target, numAttachments, 
attachments))
-_EVASGL_FUNCTION_BEGIN(void, glInvalidateSubFramebuffer, (GLenum target, 
GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei 
width, GLsizei height), (target, numAttachments, attachments, x, y, width, 
height))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetUniformIndices, (GLuint program, GLsizei 
uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices), 
(program, uniformCount, uniformNames, uniformIndices))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetUniformuiv, (GLuint program, GLint location, 
GLuint* params), (program, location, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetVertexAttribIiv, (GLuint index, GLenum 
pname, GLint *params), (index, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glGetVertexAttribIuiv, (GLuint index, GLenum 
pname, GLuint *params), (index, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glInvalidateFramebuffer, (GLenum target, GLsizei 
numAttachments, const GLenum *attachments), (target, numAttachments, 
attachments))
+_EVASGL_FUNCTION_BEGIN_VOID( glInvalidateSubFramebuffer, (GLenum target, 
GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei 
width, GLsizei height), (target, numAttachments, attachments, x, y, width, 
height))
 _EVASGL_FUNCTION_BEGIN(GLboolean, glIsQuery, (GLuint id), (id))
 _EVASGL_FUNCTION_BEGIN(GLboolean, glIsSampler, (GLuint id), (id))
 _EVASGL_FUNCTION_BEGIN(GLboolean, glIsSync, (GLsync sync), (sync))
 _EVASGL_FUNCTION_BEGIN(GLboolean, glIsTransformFeedback, (GLuint id), (id))
 _EVASGL_FUNCTION_BEGIN(GLboolean, glIsVertexArray, (GLuint array), (array))
 _EVASGL_FUNCTION_BEGIN(void *, glMapBufferRange, (GLenum target, GLintptr 
offset, GLsizeiptr length, GLbitfield access), (target, offset, length, access))
-_EVASGL_FUNCTION_BEGIN(void, glPauseTransformFeedback, (void), ())
-_EVASGL_FUNCTION_BEGIN(void, glProgramBinary, (GLuint program, GLenum 
binaryFormat, const void *binary, GLsizei length), (program, binaryFormat, 
binary, length))
-_EVASGL_FUNCTION_BEGIN(void, glProgramParameteri, (GLuint program, GLenum 
pname, GLint value), (program, pname, value))
-_EVASGL_FUNCTION_BEGIN(void, glReadBuffer, (GLenum src), (src))
-_EVASGL_FUNCTION_BEGIN(void, glRenderbufferStorageMultisample, (GLenum target, 
GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height), 
(target, samples, internalformat, width, height))
-_EVASGL_FUNCTION_BEGIN(void, glResumeTransformFeedback, (void), ())
-_EVASGL_FUNCTION_BEGIN(void, glSamplerParameterf, (GLuint sampler, GLenum 
pname, GLfloat param), (sampler, pname, param))
-_EVASGL_FUNCTION_BEGIN(void, glSamplerParameterfv, (GLuint sampler, GLenum 
pname, const GLfloat * params), (sampler, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glSamplerParameteri, (GLuint sampler, GLenum 
pname, GLint param), (sampler, pname, param))
-_EVASGL_FUNCTION_BEGIN(void, glSamplerParameteriv, (GLuint sampler, GLenum 
pname, const GLint * params), (sampler, pname, params))
-_EVASGL_FUNCTION_BEGIN(void, glTexImage3D, (GLenum target, GLint level, GLint 
internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, 
GLenum format, GLenum type, const GLvoid * data), (target, level, 
internalFormat, width, height, depth, border, format, type, data))
-_EVASGL_FUNCTION_BEGIN(void, glTexStorage2D, (GLenum target, GLsizei levels, 
GLenum internalformat, GLsizei width, GLsizei height), (target, levels, 
internalformat, width, height))
-_EVASGL_FUNCTION_BEGIN(void, glTexStorage3D, (GLenum target, GLsizei levels, 
GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth), (target, 
levels, internalformat, width, height, depth))
-_EVASGL_FUNCTION_BEGIN(void, glTexSubImage3D, (GLenum target, GLint level, 
GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, 
GLsizei depth, GLenum format, GLenum type, const GLvoid * data), (target, 
level, xoffset, yoffset, zoffset, width, height, depth, format, type, data))
-_EVASGL_FUNCTION_BEGIN(void, glTransformFeedbackVaryings, (GLuint program, 
GLsizei count, const GLchar *const* varyings, GLenum bufferMode), (program, 
count, varyings, bufferMode))
-_EVASGL_FUNCTION_BEGIN(void, glUniform1ui, (GLint location, GLuint v0), 
(location, v0))
-_EVASGL_FUNCTION_BEGIN(void, glUniform1uiv, (GLint location, GLsizei count, 
const GLuint *value), (location, count, value))
-_EVASGL_FUNCTION_BEGIN(void, glUniform2ui, (GLint location, GLuint v0, GLuint 
v1), (location, v0, v1))
-_EVASGL_FUNCTION_BEGIN(void, glUniform2uiv, (GLint location, GLsizei count, 
const GLuint *value), (location, count, value))
-_EVASGL_FUNCTION_BEGIN(void, glUniform3ui, (GLint location, GLuint v0, GLuint 
v1, GLuint v2), (location, v0, v1, v2))
-_EVASGL_FUNCTION_BEGIN(void, glUniform3uiv, (GLint location, GLsizei count, 
const GLuint *value), (location, count, value))
-_EVASGL_FUNCTION_BEGIN(void, glUniform4ui, (GLint location, GLuint v0, GLuint 
v1, GLuint v2, GLuint v3), (location, v0, v1, v2, v3))
-_EVASGL_FUNCTION_BEGIN(void, glUniform4uiv, (GLint location, GLsizei count, 
const GLuint *value), (location, count, value))
-_EVASGL_FUNCTION_BEGIN(void, glUniformBlockBinding, (GLuint program, GLuint 
uniformBlockIndex, GLuint uniformBlockBinding), (program, uniformBlockIndex, 
uniformBlockBinding))
-_EVASGL_FUNCTION_BEGIN(void, glUniformMatrix2x3fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
-_EVASGL_FUNCTION_BEGIN(void, glUniformMatrix3x2fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
-_EVASGL_FUNCTION_BEGIN(void, glUniformMatrix2x4fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
-_EVASGL_FUNCTION_BEGIN(void, glUniformMatrix4x2fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
-_EVASGL_FUNCTION_BEGIN(void, glUniformMatrix3x4fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
-_EVASGL_FUNCTION_BEGIN(void, glUniformMatrix4x3fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
+_EVASGL_FUNCTION_BEGIN_VOID( glPauseTransformFeedback, (void), ())
+_EVASGL_FUNCTION_BEGIN_VOID( glProgramBinary, (GLuint program, GLenum 
binaryFormat, const void *binary, GLsizei length), (program, binaryFormat, 
binary, length))
+_EVASGL_FUNCTION_BEGIN_VOID( glProgramParameteri, (GLuint program, GLenum 
pname, GLint value), (program, pname, value))
+_EVASGL_FUNCTION_BEGIN_VOID( glReadBuffer, (GLenum src), (src))
+_EVASGL_FUNCTION_BEGIN_VOID( glRenderbufferStorageMultisample, (GLenum target, 
GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height), 
(target, samples, internalformat, width, height))
+_EVASGL_FUNCTION_BEGIN_VOID( glResumeTransformFeedback, (void), ())
+_EVASGL_FUNCTION_BEGIN_VOID( glSamplerParameterf, (GLuint sampler, GLenum 
pname, GLfloat param), (sampler, pname, param))
+_EVASGL_FUNCTION_BEGIN_VOID( glSamplerParameterfv, (GLuint sampler, GLenum 
pname, const GLfloat * params), (sampler, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glSamplerParameteri, (GLuint sampler, GLenum 
pname, GLint param), (sampler, pname, param))
+_EVASGL_FUNCTION_BEGIN_VOID( glSamplerParameteriv, (GLuint sampler, GLenum 
pname, const GLint * params), (sampler, pname, params))
+_EVASGL_FUNCTION_BEGIN_VOID( glTexImage3D, (GLenum target, GLint level, GLint 
internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, 
GLenum format, GLenum type, const GLvoid * data), (target, level, 
internalFormat, width, height, depth, border, format, type, data))
+_EVASGL_FUNCTION_BEGIN_VOID( glTexStorage2D, (GLenum target, GLsizei levels, 
GLenum internalformat, GLsizei width, GLsizei height), (target, levels, 
internalformat, width, height))
+_EVASGL_FUNCTION_BEGIN_VOID( glTexStorage3D, (GLenum target, GLsizei levels, 
GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth), (target, 
levels, internalformat, width, height, depth))
+_EVASGL_FUNCTION_BEGIN_VOID( glTexSubImage3D, (GLenum target, GLint level, 
GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, 
GLsizei depth, GLenum format, GLenum type, const GLvoid * data), (target, 
level, xoffset, yoffset, zoffset, width, height, depth, format, type, data))
+_EVASGL_FUNCTION_BEGIN_VOID( glTransformFeedbackVaryings, (GLuint program, 
GLsizei count, const GLchar *const* varyings, GLenum bufferMode), (program, 
count, varyings, bufferMode))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniform1ui, (GLint location, GLuint v0), 
(location, v0))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniform1uiv, (GLint location, GLsizei count, 
const GLuint *value), (location, count, value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniform2ui, (GLint location, GLuint v0, GLuint 
v1), (location, v0, v1))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniform2uiv, (GLint location, GLsizei count, 
const GLuint *value), (location, count, value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniform3ui, (GLint location, GLuint v0, GLuint 
v1, GLuint v2), (location, v0, v1, v2))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniform3uiv, (GLint location, GLsizei count, 
const GLuint *value), (location, count, value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniform4ui, (GLint location, GLuint v0, GLuint 
v1, GLuint v2, GLuint v3), (location, v0, v1, v2, v3))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniform4uiv, (GLint location, GLsizei count, 
const GLuint *value), (location, count, value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniformBlockBinding, (GLuint program, GLuint 
uniformBlockIndex, GLuint uniformBlockBinding), (program, uniformBlockIndex, 
uniformBlockBinding))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniformMatrix2x3fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniformMatrix3x2fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniformMatrix2x4fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniformMatrix4x2fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniformMatrix3x4fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
+_EVASGL_FUNCTION_BEGIN_VOID( glUniformMatrix4x3fv, (GLint location, GLsizei 
count, GLboolean transpose, const GLfloat *value), (location, count, transpose, 
value))
 _EVASGL_FUNCTION_BEGIN(GLboolean, glUnmapBuffer, (GLenum target), (target))
-_EVASGL_FUNCTION_BEGIN(void, glVertexAttribDivisor, (GLuint index, GLuint 
divisor), (index, divisor))
-_EVASGL_FUNCTION_BEGIN(void, glVertexAttribI4i, (GLuint index, GLint v0, GLint 
v1, GLint v2, GLint v3), (index, v0, v1, v2, v3))
-_EVASGL_FUNCTION_BEGIN(void, glVertexAttribI4iv, (GLuint index, const GLint 
*v), (index, v))
-_EVASGL_FUNCTION_BEGIN(void, glVertexAttribI4ui, (GLuint index, GLuint v0, 
GLuint v1, GLuint v2, GLuint v3), (index, v0, v1, v2, v3))
-_EVASGL_FUNCTION_BEGIN(void, glVertexAttribI4uiv, (GLuint index, const GLuint 
*v), (index, v))
-_EVASGL_FUNCTION_BEGIN(void, glVertexAttribIPointer, (GLuint index, GLint 
size, GLenum type, GLsizei stride, const GLvoid *pointer), (index, size, type, 
stride, pointer))
-_EVASGL_FUNCTION_BEGIN(void, glWaitSync, (GLsync sync, GLbitfield flags, 
EvasGLuint64 timeout), (sync, flags, timeout))
+_EVASGL_FUNCTION_BEGIN_VOID( glVertexAttribDivisor, (GLuint index, GLuint 
divisor), (index, divisor))
+_EVASGL_FUNCTION_BEGIN_VOID( glVertexAttribI4i, (GLuint index, GLint v0, GLint 
v1, GLint v2, GLint v3), (index, v0, v1, v2, v3))
+_EVASGL_FUNCTION_BEGIN_VOID( glVertexAttribI4iv, (GLuint index, const GLint 
*v), (index, v))
+_EVASGL_FUNCTION_BEGIN_VOID( glVertexAttribI4ui, (GLuint index, GLuint v0, 
GLuint v1, GLuint v2, GLuint v3), (index, v0, v1, v2, v3))
+_EVASGL_FUNCTION_BEGIN_VOID( glVertexAttribI4uiv, (GLuint index, const GLuint 
*v), (index, v))
+_EVASGL_FUNCTION_BEGIN_VOID( glVertexAttribIPointer, (GLuint index, GLint 
size, GLenum type, GLsizei stride, const GLvoid *pointer), (index, size, type, 
stride, pointer))
+_EVASGL_FUNCTION_BEGIN_VOID( glWaitSync, (GLsync sync, GLbitfield flags, 
EvasGLuint64 timeout), (sync, flags, timeout))

-- 


Reply via email to