Evas GL: Introduce macro _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
authorJean-Philippe Andre <jp.andre@samsung.com>
Fri, 24 Oct 2014 11:26:46 +0000 (20:26 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Fri, 14 Nov 2014 01:43:00 +0000 (10:43 +0900)
It will be used to link to extension functions that need no
wrapping.

src/modules/evas/engines/gl_common/evas_gl_api_ext.c
src/modules/evas/engines/gl_common/evas_gl_api_ext.h
src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h

index 4083e73b98237c08405809958f0d6c6dec73a704..56809151bb791ff708e55eeec01ff5956ae3c076 100644 (file)
@@ -23,6 +23,7 @@ char _gl_ext_string[10240] = { 0 };
 #define _EVASGL_EXT_FUNCTION_BEGIN(ret, name, param) ret (*glextsym_##name) param = NULL;
 #define _EVASGL_EXT_FUNCTION_END()
 #define _EVASGL_EXT_FUNCTION_DRVFUNC(name)
+#define _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR(name)
 
 #include "evas_gl_api_ext_def.h"
 
@@ -34,6 +35,7 @@ char _gl_ext_string[10240] = { 0 };
 #undef _EVASGL_EXT_FUNCTION_BEGIN
 #undef _EVASGL_EXT_FUNCTION_END
 #undef _EVASGL_EXT_FUNCTION_DRVFUNC
+#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -47,6 +49,7 @@ char _gl_ext_string[10240] = { 0 };
 #define _EVASGL_EXT_FUNCTION_BEGIN(ret, name, param)
 #define _EVASGL_EXT_FUNCTION_END()
 #define _EVASGL_EXT_FUNCTION_DRVFUNC(name)
+#define _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR(name)
 
 #include "evas_gl_api_ext_def.h"
 
@@ -58,6 +61,7 @@ char _gl_ext_string[10240] = { 0 };
 #undef _EVASGL_EXT_FUNCTION_BEGIN
 #undef _EVASGL_EXT_FUNCTION_END
 #undef _EVASGL_EXT_FUNCTION_DRVFUNC
+#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -311,6 +315,9 @@ re->info->info.screen);
 #define _EVASGL_EXT_FUNCTION_DRVFUNC(name) \
    if ((*drvfunc) == NULL) *drvfunc = name;
 
+#define _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR(name) \
+   if ((*drvfunc) == NULL) *drvfunc = GETPROCADDR(name);
+
 #include "evas_gl_api_ext_def.h"
 
 #undef _EVASGL_EXT_CHECK_SUPPORT
@@ -321,6 +328,7 @@ re->info->info.screen);
 #undef _EVASGL_EXT_FUNCTION_BEGIN
 #undef _EVASGL_EXT_FUNCTION_END
 #undef _EVASGL_EXT_FUNCTION_DRVFUNC
+#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
 
 #undef GETPROCADDR
    /////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -343,6 +351,7 @@ re->info->info.screen);
 #define _EVASGL_EXT_FUNCTION_BEGIN(ret, name, param)
 #define _EVASGL_EXT_FUNCTION_END()
 #define _EVASGL_EXT_FUNCTION_DRVFUNC(name)
+#define _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR(name)
 
 #include "evas_gl_api_ext_def.h"
 
@@ -354,6 +363,7 @@ re->info->info.screen);
 #undef _EVASGL_EXT_FUNCTION_BEGIN
 #undef _EVASGL_EXT_FUNCTION_END
 #undef _EVASGL_EXT_FUNCTION_DRVFUNC
+#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
    /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -391,6 +401,7 @@ evgl_api_ext_get(Evas_GL_API *gl_funcs)
 #define _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(ret, name, param)
 #define _EVASGL_EXT_FUNCTION_PRIVATE_END()
 #define _EVASGL_EXT_FUNCTION_DRVFUNC(name)
+#define _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR(name)
 
 #include "evas_gl_api_ext_def.h"
 
@@ -404,6 +415,7 @@ evgl_api_ext_get(Evas_GL_API *gl_funcs)
 #undef _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN
 #undef _EVASGL_EXT_FUNCTION_PRIVATE_END
 #undef _EVASGL_EXT_FUNCTION_DRVFUNC
+#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
    /////////////////////////////////////////////////////////////////////////////////////////////////////
 #undef ORD
 
index 31f78735693b60b4757027e3193e9cf24af5c5a6..9d53fc29f6713fdff7799d425754e6b0089d4bdc 100644 (file)
@@ -27,6 +27,7 @@
 #define _EVASGL_EXT_FUNCTION_BEGIN(ret, name, param) extern ret (*glextsym_##name) param;
 #define _EVASGL_EXT_FUNCTION_END()
 #define _EVASGL_EXT_FUNCTION_DRVFUNC(name)
+#define _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR(name)
 
 #include "evas_gl_api_ext_def.h"
 
@@ -38,6 +39,7 @@
 #undef _EVASGL_EXT_FUNCTION_BEGIN
 #undef _EVASGL_EXT_FUNCTION_END
 #undef _EVASGL_EXT_FUNCTION_DRVFUNC
+#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 #define EXT_FUNC(fname) glextsym_##fname
 
@@ -53,6 +55,7 @@
 #define _EVASGL_EXT_FUNCTION_BEGIN(ret, name, param)
 #define _EVASGL_EXT_FUNCTION_END()
 #define _EVASGL_EXT_FUNCTION_DRVFUNC(name)
+#define _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR(name)
 
 #include "evas_gl_api_ext_def.h"
 
@@ -64,6 +67,7 @@
 #undef _EVASGL_EXT_FUNCTION_BEGIN
 #undef _EVASGL_EXT_FUNCTION_END
 #undef _EVASGL_EXT_FUNCTION_DRVFUNC
+#undef _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 #define EXTENSION_SUPPORT(name) (_gl_ext_support_##name == 1)
 
index c86722644658786b1a3ebfe32dd231b8f2256f9b..1612aaf4c3264069a86829884d32f5770204fb42 100644 (file)
@@ -31,6 +31,9 @@
 // Driver extension functions to wrap (name : SPEC extension function name)
 #define _EVASGL_EXT_FUNCTION_DRVFUNC(name)
 
+// Driver extension functions that need no wrapping
+#define _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR(name)
+
 #endif
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -51,12 +54,12 @@ _EVASGL_EXT_BEGIN(get_program_binary)
        _EVASGL_EXT_DRVNAME(GL_OES_get_program_binary)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetProgramBinaryOES, (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetProgramBinary"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetProgramBinaryOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetProgramBinary")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetProgramBinaryOES")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glProgramBinaryOES, (GLuint program, GLenum binaryFormat, const void *binary, GLint length))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glProgramBinary"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glProgramBinaryOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glProgramBinary")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glProgramBinaryOES")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -65,16 +68,16 @@ _EVASGL_EXT_BEGIN(mapbuffer)
        _EVASGL_EXT_DRVNAME(GL_OES_mapbuffer)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void *, glMapBufferOES, (GLenum target, GLenum access))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMapBuffer"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMapBufferOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMapBuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMapBufferOES")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(GLboolean, glUnmapBufferOES, (GLenum target))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glUnmapBuffer"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glUnmapBufferOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glUnmapBuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glUnmapBufferOES")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetBufferPointervOES, (GLenum target, GLenum pname, void** params))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetBufferPointerv"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetBufferPointervOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetBufferPointerv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetBufferPointervOES")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -82,28 +85,28 @@ _EVASGL_EXT_BEGIN(texture_3D)
        _EVASGL_EXT_DRVNAME(GL_OES_texture_3D)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glTexImage3DOES, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexImage3D"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexImage3DOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexImage3D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexImage3DOES")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexSubImage3D"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexSubImage3DOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexSubImage3D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexSubImage3DOES")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glCopyTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCopyTexSubImage3D"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCopyTexSubImage3DOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCopyTexSubImage3D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCopyTexSubImage3DOES")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glCompressedTexImage3DOES, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCompressedTexImage3D"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCompressedTexImage3DOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCompressedTexImage3D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCompressedTexImage3DOES")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glCompressedTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCompressedTexSubImage3D"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCompressedTexSubImage3DOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCompressedTexSubImage3D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCompressedTexSubImage3DOES")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glFramebufferTexture3DOES, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture3D"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture3DOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture3D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture3DOES")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -112,37 +115,37 @@ _EVASGL_EXT_BEGIN(AMD_performance_monitor)
        _EVASGL_EXT_DRVNAME(AMD_performance_monitor)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetPerfMonitorGroupsAMD, (GLint* numGroups, GLsizei groupsSize, GLuint* groups))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetPerfMonitorGroupsAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetPerfMonitorGroupsAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetPerfMonitorCountersAMD, (GLuint group, GLint* numCounters, GLint* maxActiveCounters, GLsizei counterSize, GLuint* counters))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetPerfMonitorCountersAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetPerfMonitorCountersAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetPerfMonitorGroupStringAMD, (GLuint group, GLsizei bufSize, GLsizei* length, char* groupString))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetPerfMonitorGroupStringAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetPerfMonitorGroupStringAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetPerfMonitorCounterStringAMD, (GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, char* counterString))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetPerfMonitorCounterStringAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetPerfMonitorCounterStringAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetPerfMonitorCounterInfoAMD, (GLuint group, GLuint counter, GLenum pname, void* data))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetPerfMonitorCounterInfoAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetPerfMonitorCounterInfoAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGenPerfMonitorsAMD, (GLsizei n, GLuint* monitors))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenPerfMonitorsAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenPerfMonitorsAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glDeletePerfMonitorsAMD, (GLsizei n, GLuint* monitors))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeletePerfMonitorsAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeletePerfMonitorsAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glSelectPerfMonitorCountersAMD, (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint* countersList))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glSelectPerfMonitorCountersAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glSelectPerfMonitorCountersAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glBeginPerfMonitorAMD, (GLuint monitor))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBeginPerfMonitorAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBeginPerfMonitorAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glEndPerfMonitorAMD, (GLuint monitor))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glEndPerfMonitorAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glEndPerfMonitorAMD")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetPerfMonitorCounterDataAMD, (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint* bytesWritten))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetPerfMonitorCounterDataAMD"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetPerfMonitorCounterDataAMD")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -151,8 +154,8 @@ _EVASGL_EXT_BEGIN(discard_framebuffer)
        _EVASGL_EXT_DRVNAME(GL_EXT_discard_framebuffer)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glDiscardFramebufferEXT, (GLenum target, GLsizei numAttachments, const GLenum* attachments))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDiscardFramebuffer"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDiscardFramebufferEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDiscardFramebuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDiscardFramebufferEXT")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -161,13 +164,13 @@ _EVASGL_EXT_BEGIN(multi_draw_arrays)
        _EVASGL_EXT_DRVNAME(GL_EXT_multi_draw_arrays)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glMultiDrawArraysEXT, (GLenum mode, GLint* first, GLsizei* count, GLsizei primcount))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultiDrawArrays"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultiDrawArraysEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultiDrawArrays")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultiDrawArraysEXT")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glMultiDrawElementsEXT, (GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultiDrawElements"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultiDrawElementsEXT"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultiDrawElementsARB"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultiDrawElements")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultiDrawElementsEXT")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultiDrawElementsARB")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -176,25 +179,25 @@ _EVASGL_EXT_BEGIN(NV_fence)
        _EVASGL_EXT_DRVNAME(GL_NV_fence)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glDeleteFencesNV, (GLsizei n, const GLuint* fences))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeleteFencesNV"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeleteFencesNV")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGenFencesNV, (GLsizei n, GLuint* fences))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenFencesNV"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenFencesNV")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(unsigned char, glIsFenceNV, (GLuint fence))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glIsFenceNV"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glIsFenceNV")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(unsigned char, glTestFenceNV, (GLuint fence))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTestFenceNV"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTestFenceNV")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetFenceivNV, (GLuint fence, GLenum pname, GLint* params))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetFenceivNV"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetFenceivNV")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glFinishFenceNV, (GLuint fence))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFinishFenceNV"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFinishFenceNV")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glSetFenceNV, (GLuint, GLenum))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glSetFenceNV"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glSetFenceNV")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -203,16 +206,16 @@ _EVASGL_EXT_BEGIN(QCOM_driver_control)
        _EVASGL_EXT_DRVNAME(GL_QCOM_driver_control)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetDriverControlsQCOM, (GLint* num, GLsizei size, GLuint* driverControls))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetDriverControlsQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetDriverControlsQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glGetDriverControlStringQCOM, (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetDriverControlStringQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetDriverControlStringQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glEnableDriverControlQCOM, (GLuint driverControl))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glEnableDriverControlQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glEnableDriverControlQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glDisableDriverControlQCOM, (GLuint driverControl))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDisableDriverControlQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDisableDriverControlQCOM")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -221,28 +224,28 @@ _EVASGL_EXT_BEGIN(QCOM_extended_get)
        _EVASGL_EXT_DRVNAME(GL_QCOM_extended_get)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetTexturesQCOM, (GLuint* textures, GLint maxTextures, GLint* numTextures))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetTexturesQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetTexturesQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetBuffersQCOM, (GLuint* buffers, GLint maxBuffers, GLint* numBuffers))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetBuffersQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetBuffersQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetRenderbuffersQCOM, (GLuint* renderbuffers, GLint maxRenderbuffers, GLint* numRenderbuffers))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetRenderbuffersQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetRenderbuffersQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetFramebuffersQCOM, (GLuint* framebuffers, GLint maxFramebuffers, GLint* numFramebuffers))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetFramebuffersQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetFramebuffersQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetTexLevelParameterivQCOM, (GLuint texture, GLenum face, GLint level, GLenum pname, GLint* params))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetTexLevelParameterivQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetTexLevelParameterivQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtTexObjectStateOverrideiQCOM, (GLenum target, GLenum pname, GLint param))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtTexObjectStateOverrideiQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtTexObjectStateOverrideiQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetTexSubImageQCOM, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void* texels))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetTexSubImageQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetTexSubImageQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetBufferPointervQCOM, (GLenum target, void** params))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetBufferPointervQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetBufferPointervQCOM")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -251,16 +254,16 @@ _EVASGL_EXT_BEGIN(QCOM_extended_get2)
        _EVASGL_EXT_DRVNAME(GL_QCOM_extended_get2)
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetShadersQCOM, (GLuint* shaders, GLint maxShaders, GLint* numShaders))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetShadersQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetShadersQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetProgramsQCOM, (GLuint* programs, GLint maxPrograms, GLint* numPrograms))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetProgramsQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetProgramsQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(unsigned char, glExtIsProgramBinaryQCOM, (GLuint program))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtIsProgramBinaryQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtIsProgramBinaryQCOM")
        _EVASGL_EXT_FUNCTION_END()
        _EVASGL_EXT_FUNCTION_BEGIN(void, glExtGetProgramBinarySourceQCOM, (GLuint program, GLenum shadertype, char* source, GLint* length))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glExtGetProgramBinarySourceQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glExtGetProgramBinarySourceQCOM")
        _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -273,12 +276,12 @@ _EVASGL_EXT_BEGIN(EXT_multisampled_render_to_texture)
 
         /* GLES 1.x extension */
         _EVASGL_EXT_FUNCTION_BEGIN(void, glRenderbufferStorageMultisampleEXT, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorageMultisample"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorageMultisampleEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorageMultisample")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorageMultisampleEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glFramebufferTexture2DMultisampleEXT, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture2DMultisample"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture2DMultisampleEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture2DMultisample")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture2DMultisampleEXT")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -287,14 +290,14 @@ _EVASGL_EXT_BEGIN(multisampled_render_to_texture)
        _EVASGL_EXT_DRVNAME(GL_EXT_multisampled_render_to_texture)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void, glRenderbufferStorageMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorageMultisample"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorageMultisampleIMG"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorageMultisampleEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorageMultisample")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorageMultisampleIMG")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorageMultisampleEXT")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void, glFramebufferTexture2DMultisample, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture2DMultisample"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture2DMultisampleIMG"))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture2DMultisampleEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture2DMultisample")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture2DMultisampleIMG")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture2DMultisampleEXT")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 _EVASGL_EXT_END()
 
@@ -448,8 +451,8 @@ _EVASGL_EXT_BEGIN(blend_equation_separate)
         _EVASGL_EXT_DRVNAME(GL_OES_blend_equation_separate)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glBlendEquationSeparateOES, (GLenum modeRGB, GLenum modeAlpha))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBlendEquationSeparate"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBlendEquationSeparateOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBlendEquationSeparate")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBlendEquationSeparateOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -458,8 +461,8 @@ _EVASGL_EXT_BEGIN(blend_func_separate)
         _EVASGL_EXT_DRVNAME(GL_OES_blend_func_separate)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glBlendFuncSeparateOES, (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBlendFuncSeparate"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBlendFuncSeparateOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBlendFuncSeparate")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBlendFuncSeparateOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -468,8 +471,8 @@ _EVASGL_EXT_BEGIN(blend_subtract)
         _EVASGL_EXT_DRVNAME(GL_OES_blend_subtract)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glBlendEquationOES, (GLenum mode))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBlendEquation"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBlendEquationOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBlendEquation")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBlendEquationOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -483,36 +486,36 @@ _EVASGL_EXT_BEGIN(draw_texture)
         _EVASGL_EXT_DRVNAME(GL_OES_draw_texture)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDrawTexsOES, (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexs"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexsOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexs")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexsOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDrawTexiOES, (GLint x, GLint y, GLint z, GLint width, GLint height))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexi"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexiOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexi")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexiOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDrawTexxOES, (GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDrawTexsvOES, (const GLshort *coords))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexsv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexsvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexsv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexsvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDrawTexivOES, (const GLint *coords))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexiv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexivOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexiv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexivOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDrawTexxvOES, (const GLfixed *coords))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDrawTexfOES, (GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexf"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexfOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexf")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexfOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDrawTexfvOES, (const GLfloat *coords))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexfv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDrawTexfvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexfv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDrawTexfvOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -526,160 +529,160 @@ _EVASGL_EXT_BEGIN(fixed_point)
         _EVASGL_EXT_DRVNAME(GL_OES_fixed_point)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glAlphaFuncxOES, (GLenum func, GLclampx ref))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glAlphaFuncx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glAlphaFuncxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glAlphaFuncx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glAlphaFuncxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glClearColorxOES, (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClearColorx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClearColorxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClearColorx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClearColorxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glClearDepthxOES, (GLclampx depth))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClearDepthx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClearDepthxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClearDepthx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClearDepthxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glClipPlanexOES, (GLenum plane, const GLfixed *equation))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClipPlanex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClipPlanexOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClipPlanex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClipPlanexOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glColor4xOES, (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glColor4x"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glColor4xOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glColor4x")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glColor4xOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDepthRangexOES, (GLclampx zNear, GLclampx zFar))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDepthRangex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDepthRangexOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDepthRangex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDepthRangexOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glFogxOES, (GLenum pname, GLfixed param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFogx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFogxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFogx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFogxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glFogxvOES, (GLenum pname, const GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFogxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFogxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFogxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFogxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glFrustumxOES, (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFrustumx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFrustumxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFrustumx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFrustumxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetClipPlanexOES, (GLenum pname, GLfixed eqn[4]))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetClipPlanex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetClipPlanexOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetClipPlanex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetClipPlanexOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetFixedvOES, (GLenum pname, GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetFixedv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetFixedvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetFixedv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetFixedvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetLightxvOES, (GLenum light, GLenum pname, GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetLightxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetLightxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetLightxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetLightxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetMaterialxvOES, (GLenum face, GLenum pname, GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetMaterialxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetMaterialxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetMaterialxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetMaterialxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetTexEnvxvOES, (GLenum env, GLenum pname, GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexEnvxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexEnvxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexEnvxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexEnvxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetTexParameterxvOES, (GLenum target, GLenum pname, GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexParameterxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexParameterxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexParameterxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexParameterxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glLightModelxOES, (GLenum pname, GLfixed param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLightModelx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLightModelxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLightModelx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLightModelxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glLightModelxvOES, (GLenum pname, const GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLightModelxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLightModelxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLightModelxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLightModelxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glLightxOES, (GLenum light, GLenum pname, GLfixed param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLightx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLightxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLightx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLightxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glLightxvOES, (GLenum light, GLenum pname, const GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLightxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLightxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLightxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLightxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glLineWidthxOES, (GLfixed width))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLineWidthx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLineWidthxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLineWidthx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLineWidthxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glLoadMatrixxOES, (const GLfixed *m))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLoadMatrixx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLoadMatrixxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLoadMatrixx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLoadMatrixxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glMaterialxOES, (GLenum face, GLenum pname, GLfixed param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMaterialx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMaterialxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMaterialx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMaterialxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glMaterialxvOES, (GLenum face, GLenum pname, const GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMaterialxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMaterialxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMaterialxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMaterialxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glMultMatrixxOES, (const GLfixed *m))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultMatrixx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultMatrixxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultMatrixx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultMatrixxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glMultiTexCoord4xOES, (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultiTexCoord4x"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMultiTexCoord4xOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultiTexCoord4x")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMultiTexCoord4xOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glNormal3xOES, (GLfixed nx, GLfixed ny, GLfixed nz))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glNormal3x"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glNormal3xOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glNormal3x")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glNormal3xOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glOrthoxOES, (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glOrthox"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glOrthoxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glOrthox")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glOrthoxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glPointParameterxOES, (GLenum pname, GLfixed param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glPointParameterx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glPointParameterxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glPointParameterx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glPointParameterxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glPointParameterxvOES, (GLenum pname, const GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glPointParameterxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glPointParameterxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glPointParameterxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glPointParameterxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glPointSizexOES, (GLfixed size))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glPointSizex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glPointSizexOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glPointSizex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glPointSizexOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glPolygonOffsetxOES, (GLfixed factor, GLfixed units))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glPolygonOffsetx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glPolygonOffsetxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glPolygonOffsetx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glPolygonOffsetxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glRotatexOES, (GLfixed angle, GLfixed x, GLfixed y, GLfixed z))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRotatex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRotatexOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRotatex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRotatexOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glSampleCoveragexOES, (GLclampx value, GLboolean invert))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glSampleCoveragex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glSampleCoveragexOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glSampleCoveragex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glSampleCoveragexOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glScalexOES, (GLfixed x, GLfixed y, GLfixed z))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glScalex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glScalexOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glScalex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glScalexOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexEnvxOES, (GLenum target, GLenum pname, GLfixed param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexEnvx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexEnvxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexEnvx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexEnvxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexEnvxvOES, (GLenum target, GLenum pname, const GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexEnvxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexEnvxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexEnvxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexEnvxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexParameterxOES, (GLenum target, GLenum pname, GLfixed param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexParameterx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexParameterxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexParameterx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexParameterxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexParameterxvOES, (GLenum target, GLenum pname, const GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexParameterxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexParameterxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexParameterxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexParameterxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTranslatexOES, (GLfixed x, GLfixed y, GLfixed z))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTranslatex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTranslatexOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTranslatex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTranslatexOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -688,64 +691,64 @@ _EVASGL_EXT_BEGIN(framebuffer_object)
         _EVASGL_EXT_DRVNAME(GL_OES_framebuffer_object)
 
         _EVASGL_EXT_FUNCTION_BEGIN(GLboolean, glIsRenderbufferOES, (GLuint renderbuffer))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glIsRenderbuffer"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glIsRenderbufferOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glIsRenderbuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glIsRenderbufferOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glBindRenderbufferOES, (GLenum target, GLuint renderbuffer))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBindRenderbuffer"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBindRenderbufferOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBindRenderbuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBindRenderbufferOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDeleteRenderbuffersOES, (GLsizei n, const GLuint* renderbuffers))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeleteRenderbuffers"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeleteRenderbuffersOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeleteRenderbuffers")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeleteRenderbuffersOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGenRenderbuffersOES, (GLsizei n, GLuint* renderbuffers))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenRenderbuffers"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenRenderbuffersOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenRenderbuffers")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenRenderbuffersOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glRenderbufferStorageOES, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorage"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorageOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorage")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorageOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetRenderbufferParameterivOES, (GLenum target, GLenum pname, GLint* params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetRenderbufferParameteriv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetRenderbufferParameterivOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetRenderbufferParameteriv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetRenderbufferParameterivOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(GLboolean, glIsFramebufferOES, (GLuint framebuffer))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glIsFramebuffer"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glIsFramebufferOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glIsFramebuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glIsFramebufferOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glBindFramebufferOES, (GLenum target, GLuint framebuffer))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBindFramebuffer"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBindFramebufferOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBindFramebuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBindFramebufferOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDeleteFramebuffersOES, (GLsizei n, const GLuint* framebuffers))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeleteFramebuffers"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeleteFramebuffersOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeleteFramebuffers")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeleteFramebuffersOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGenFramebuffersOES, (GLsizei n, GLuint* framebuffers))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenFramebuffers"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenFramebuffersOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenFramebuffers")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenFramebuffersOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(GLenum, glCheckFramebufferStatusOES, (GLenum target))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCheckFramebufferStatus"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCheckFramebufferStatusOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCheckFramebufferStatus")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCheckFramebufferStatusOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glFramebufferRenderbufferOES, (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferRenderbuffer"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferRenderbufferOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferRenderbuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferRenderbufferOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glFramebufferTexture2DOES, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture2D"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFramebufferTexture2DOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture2D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFramebufferTexture2DOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetFramebufferAttachmentParameterivOES, (GLenum target, GLenum attachment, GLenum pname, GLint* params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetFramebufferAttachmentParameteriv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetFramebufferAttachmentParameterivOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetFramebufferAttachmentParameteriv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetFramebufferAttachmentParameterivOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGenerateMipmapOES, (GLenum target))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenerateMipmap"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenerateMipmapOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenerateMipmap")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenerateMipmapOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -758,20 +761,20 @@ _EVASGL_EXT_BEGIN(matrix_palette)
         _EVASGL_EXT_DRVNAME(GL_OES_matrix_palette)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glCurrentPaletteMatrixOES, (GLuint matrixpaletteindex))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCurrentPaletteMatrix"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCurrentPaletteMatrixOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCurrentPaletteMatrix")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCurrentPaletteMatrixOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glLoadPaletteFromModelViewMatrixOES, (void))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLoadPaletteFromModelViewMatrix"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glLoadPaletteFromModelViewMatrixOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLoadPaletteFromModelViewMatrix")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glLoadPaletteFromModelViewMatrixOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glMatrixIndexPointerOES, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMatrixIndexPointer"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMatrixIndexPointerOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMatrixIndexPointer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMatrixIndexPointerOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glWeightPointerOES, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glWeightPointer"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glWeightPointerOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glWeightPointer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glWeightPointerOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -784,8 +787,8 @@ _EVASGL_EXT_BEGIN(query_matrix)
         _EVASGL_EXT_DRVNAME(GL_OES_query_matrix)
 
         _EVASGL_EXT_FUNCTION_BEGIN(GLbitfield, glQueryMatrixxOES, (GLfixed mantissa[16], GLint exponent[16]))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glQueryMatrixx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glQueryMatrixxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glQueryMatrixx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glQueryMatrixxOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -794,28 +797,28 @@ _EVASGL_EXT_BEGIN(single_precision)
         _EVASGL_EXT_DRVNAME(GL_OES_single_precision)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDepthRangefOES, (GLclampf zNear, GLclampf zFar))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDepthRangef"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDepthRangefOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDepthRangef")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDepthRangefOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glFrustumfOES, (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFrustumf"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFrustumfOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFrustumf")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFrustumfOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glOrthofOES, (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glOrthof"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glOrthofOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glOrthof")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glOrthofOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glClipPlanefOES, (GLenum plane, const GLfloat *equation))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClipPlanef"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClipPlanefOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClipPlanef")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClipPlanefOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetClipPlanefOES, (GLenum pname, GLfloat eqn[4]))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetClipPlanef"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetClipPlanefOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetClipPlanef")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetClipPlanefOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glClearDepthfOES, (GLclampf depth))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClearDepthf"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClearDepthfOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClearDepthf")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClearDepthfOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -834,40 +837,40 @@ _EVASGL_EXT_BEGIN(texture_cube_map)
         _EVASGL_EXT_DRVNAME(GL_OES_texture_cube_map)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexGenfOES, (GLenum coord, GLenum pname, GLfloat param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenf"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenfOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenf")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenfOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexGenfvOES, (GLenum coord, GLenum pname, const GLfloat *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenfv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenfvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenfv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenfvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexGeniOES, (GLenum coord, GLenum pname, GLint param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGeni"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGeniOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGeni")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGeniOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexGenivOES, (GLenum coord, GLenum pname, const GLint *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGeniv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenivOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGeniv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenivOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexGenxOES, (GLenum coord, GLenum pname, GLfixed param))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenx"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenxOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenx")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenxOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexGenxvOES, (GLenum coord, GLenum pname, const GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexGenxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexGenxvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetTexGenfvOES, (GLenum coord, GLenum pname, GLfloat *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexGenfv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexGenfvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexGenfv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexGenfvOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetTexGenivOES, (GLenum coord, GLenum pname, GLint *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexGeniv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexGenivOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexGeniv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexGenivOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetTexGenxvOES, (GLenum coord, GLenum pname, GLfixed *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexGenxv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetTexGenxvOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexGenxv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetTexGenxvOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -885,20 +888,20 @@ _EVASGL_EXT_BEGIN(vertex_array_object)
         _EVASGL_EXT_DRVNAME(GL_OES_vertex_array_object)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glBindVertexArrayOES, (GLuint array))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBindVertexArray"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glBindVertexArrayOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBindVertexArray")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glBindVertexArrayOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDeleteVertexArraysOES, (GLsizei n, const GLuint *arrays))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeleteVertexArrays"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeleteVertexArraysOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeleteVertexArrays")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeleteVertexArraysOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGenVertexArraysOES, (GLsizei n, GLuint *arrays))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenVertexArrays"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGenVertexArraysOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenVertexArrays")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGenVertexArraysOES")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(GLboolean, glIsVertexArrayOES, (GLuint array))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glIsVertexArray"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glIsVertexArrayOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glIsVertexArray")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glIsVertexArrayOES")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -907,8 +910,8 @@ _EVASGL_EXT_BEGIN(APPLE_copy_texture_levels)
         _EVASGL_EXT_DRVNAME(GL_APPLE_copy_texture_levels)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glCopyTextureLevelsAPPLE, (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCopyTextureLevels"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glCopyTextureLevelsAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCopyTextureLevels")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glCopyTextureLevelsAPPLE")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -916,12 +919,12 @@ _EVASGL_EXT_BEGIN(APPLE_framebuffer_multisample)
         _EVASGL_EXT_DRVNAME(GL_APPLE_framebuffer_multisample)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glRenderbufferStorageMultisampleAPPLE, (GLenum, GLsizei, GLenum, GLsizei, GLsizei))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorageMultisample"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glRenderbufferStorageMultisampleAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorageMultisample")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glRenderbufferStorageMultisampleAPPLE")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glResolveMultisampleFramebufferAPPLE, (void))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glResolveMultisampleFramebuffer"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glResolveMultisampleFramebufferAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glResolveMultisampleFramebuffer")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glResolveMultisampleFramebufferAPPLE")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -929,25 +932,25 @@ _EVASGL_EXT_BEGIN(APPLE_sync)
         _EVASGL_EXT_DRVNAME(GL_APPLE_sync)
 
         _EVASGL_EXT_FUNCTION_BEGIN(GLsync, glFenceSyncAPPLE, (GLenum condition, GLbitfield flags))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFenceSyncAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFenceSyncAPPLE")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(GLboolean, glIsSyncAPPLE, (GLsync sync))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glIsSyncAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glIsSyncAPPLE")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glDeleteSyncAPPLE, (GLsync sync))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glDeleteSyncAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glDeleteSyncAPPLE")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(GLenum, glClientWaitSyncAPPLE, (GLsync sync, GLbitfield flags, EvasGLuint64 timeout))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClientWaitSyncAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClientWaitSyncAPPLE")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glWaitSyncAPPLE, (GLsync sync, GLbitfield flags, EvasGLuint64 timeout))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glWaitSyncAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glWaitSyncAPPLE")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetInteger64vAPPLE, (GLenum pname, EvasGLint64 *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetInteger64vAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetInteger64vAPPLE")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetSyncivAPPLE, (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetSyncivAPPLE"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetSyncivAPPLE")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -974,12 +977,12 @@ _EVASGL_EXT_BEGIN(map_buffer_range)
         _EVASGL_EXT_DRVNAME(GL_EXT_map_buffer_range)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void *, glMapBufferRangeEXT, (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMapBufferRange"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glMapBufferRangeEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMapBufferRange")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glMapBufferRangeEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glFlushMappedBufferRangeEXT, (GLenum target, GLintptr offset, GLsizeiptr length))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFlushMappedBufferRange"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glFlushMappedBufferRangeEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFlushMappedBufferRange")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glFlushMappedBufferRangeEXT")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -987,20 +990,20 @@ _EVASGL_EXT_BEGIN(robustness)
         _EVASGL_EXT_DRVNAME(GL_EXT_robustness)
 
         _EVASGL_EXT_FUNCTION_BEGIN(GLenum, glGetGraphicsResetStatusEXT, (void))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetGraphicsResetStatus"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetGraphicsResetStatusEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetGraphicsResetStatus")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetGraphicsResetStatusEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glReadnPixelsEXT, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glReadnPixels"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glReadnPixelsEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glReadnPixels")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glReadnPixelsEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetnUniformfvEXT, (GLuint program, GLint location, GLsizei bufSize, float *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetnUniformfv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetnUniformfvEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetnUniformfv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetnUniformfvEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glGetnUniformivEXT, (GLuint program, GLint location, GLsizei bufSize, GLint *params))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetnUniformiv"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glGetnUniformivEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetnUniformiv")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glGetnUniformivEXT")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -1020,28 +1023,28 @@ _EVASGL_EXT_BEGIN(texture_storage)
         _EVASGL_EXT_DRVNAME(GL_EXT_texture_storage)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexStorage1DEXT, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexStorage1D"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexStorage1DEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexStorage1D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexStorage1DEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexStorage2DEXT, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexStorage2D"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexStorage2DEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexStorage2D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexStorage2DEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTexStorage3DEXT, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexStorage3D"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTexStorage3DEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexStorage3D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTexStorage3DEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTextureStorage1DEXT, (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTextureStorage1D"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTextureStorage1DEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTextureStorage1D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTextureStorage1DEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTextureStorage2DEXT, (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTextureStorage2D"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTextureStorage2DEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTextureStorage2D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTextureStorage2DEXT")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glTextureStorage3DEXT, (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTextureStorage3D"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glTextureStorage3DEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTextureStorage3D")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glTextureStorage3DEXT")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -1054,12 +1057,12 @@ _EVASGL_EXT_BEGIN(IMG_user_clip_plane)
         _EVASGL_EXT_DRVNAME(GL_IMG_user_clip_plane)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glClipPlanefIMG, (GLenum, const GLfloat *))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClipPlanef"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClipPlanefIMG"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClipPlanef")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClipPlanefIMG")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glClipPlanexIMG, (GLenum, const GLfixed *))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClipPlanex"))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glClipPlanexIMG"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClipPlanex")
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glClipPlanexIMG")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -1067,10 +1070,10 @@ _EVASGL_EXT_BEGIN(QCOM_tiled_rendering)
         _EVASGL_EXT_DRVNAME(GL_QCOM_tiled_rendering)
 
         _EVASGL_EXT_FUNCTION_BEGIN(void, glStartTilingQCOM, (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glStartTilingQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glStartTilingQCOM")
         _EVASGL_EXT_FUNCTION_END()
         _EVASGL_EXT_FUNCTION_BEGIN(void, glEndTilingQCOM, (GLbitfield preserveMask))
-                _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glEndTilingQCOM"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glEndTilingQCOM")
         _EVASGL_EXT_FUNCTION_END()
 _EVASGL_EXT_END()
 
@@ -1088,10 +1091,10 @@ _EVASGL_EXT_BEGIN(EGL_KHR_image_base)
        _EVASGL_EXT_DRVNAME(EGL_KHR_image_base)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void *, eglCreateImage, (EGLDisplay a, EGLContext b, EGLenum c, EGLClientBuffer d, const int *e))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglCreateImageKHR"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglCreateImageKHR")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void, eglDestroyImage, (EGLDisplay a, void *b))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglDestroyImageKHR"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglDestroyImageKHR")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 
        _EVASGL_EXT_FUNCTION_BEGIN(EvasGLImage, evasglCreateImage, (int target, void* buffer, const int *attrib_list))
@@ -1121,10 +1124,10 @@ _EVASGL_EXT_BEGIN(GL_OES_EGL_image)
        _EVASGL_EXT_DRVNAME(GL_OES_EGL_image)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void, glEGLImageTargetTexture2DOES, (GLenum target, GLeglImageOES image))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glEGLImageTargetTexture2DOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glEGLImageTargetTexture2DOES")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void, glEGLImageTargetRenderbufferStorageOES, (GLenum target, GLeglImageOES image))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glEGLImageTargetRenderbufferStorageOES"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glEGLImageTargetRenderbufferStorageOES")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 
        _EVASGL_EXT_FUNCTION_BEGIN(void, glEvasGLImageTargetTexture2DOES, (GLenum target, EvasGLImage image))
@@ -1136,7 +1139,7 @@ _EVASGL_EXT_BEGIN(GL_OES_EGL_image)
 
        #ifdef _EVASGL_EXT_VERIFY
        {
-               if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base")) _EVASGL_EXT_DISCARD_SUPPORT();
+                if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base") _EVASGL_EXT_DISCARD_SUPPORT();
        }
        #endif
 
@@ -1148,7 +1151,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_image_pixmap)
        _EVASGL_EXT_DRVNAME(EGL_KHR_image_pixmap)
        #ifdef _EVASGL_EXT_VERIFY
        {
-               if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base")) _EVASGL_EXT_DISCARD_SUPPORT();
+                if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base") _EVASGL_EXT_DISCARD_SUPPORT();
        }
        #endif
 _EVASGL_EXT_END()
@@ -1158,7 +1161,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_image)
        _EVASGL_EXT_DRVNAME(EGL_KHR_image)
        #ifdef _EVASGL_EXT_VERIFY
        {
-               if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base")) _EVASGL_EXT_DISCARD_SUPPORT();
+                if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base") _EVASGL_EXT_DISCARD_SUPPORT();
        }
        #endif
 _EVASGL_EXT_END()
@@ -1168,7 +1171,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_vg_parent_image)
        _EVASGL_EXT_DRVNAME(EvasGL_KHR_vg_parent_image)
        #ifdef _EVASGL_EXT_VERIFY
        {
-               if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base")) _EVASGL_EXT_DISCARD_SUPPORT();
+                if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base") _EVASGL_EXT_DISCARD_SUPPORT();
        }
        #endif
 _EVASGL_EXT_END()
@@ -1178,7 +1181,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_gl_texture_2D_image)
        _EVASGL_EXT_DRVNAME(EGL_KHR_gl_texture_2D_image)
        #ifdef _EVASGL_EXT_VERIFY
        {
-               if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base")) _EVASGL_EXT_DISCARD_SUPPORT();
+                if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base") _EVASGL_EXT_DISCARD_SUPPORT();
        }
        #endif
 _EVASGL_EXT_END()
@@ -1188,7 +1191,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_gl_texture_cubemap_image)
        _EVASGL_EXT_DRVNAME(EGL_KHR_gl_texture_cubemap_image)
        #ifdef _EVASGL_EXT_VERIFY
        {
-               if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base")) _EVASGL_EXT_DISCARD_SUPPORT();
+                if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base") _EVASGL_EXT_DISCARD_SUPPORT();
        }
        #endif
 _EVASGL_EXT_END()
@@ -1198,7 +1201,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_gl_texture_3D_image)
        _EVASGL_EXT_DRVNAME(EGL_KHR_gl_texture_3D_image)
        #ifdef _EVASGL_EXT_VERIFY
        {
-               if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base")) _EVASGL_EXT_DISCARD_SUPPORT();
+                if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base") _EVASGL_EXT_DISCARD_SUPPORT();
        }
        #endif
 _EVASGL_EXT_END()
@@ -1208,7 +1211,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_gl_renderbuffer_image)
        _EVASGL_EXT_DRVNAME(EGL_KHR_gl_renderbuffer_image)
        #ifdef _EVASGL_EXT_VERIFY
        {
-               if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base")) _EVASGL_EXT_DISCARD_SUPPORT();
+                if (!_EVASGL_EXT_CHECK_SUPPORT("EGL_KHR_image_base") _EVASGL_EXT_DISCARD_SUPPORT();
        }
        #endif
 _EVASGL_EXT_END()
@@ -1218,16 +1221,16 @@ _EVASGL_EXT_BEGIN(EGL_KHR_fence_sync)
        _EVASGL_EXT_DRVNAME(EGL_KHR_fence_sync)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void *, eglCreateSyncKHR, (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglCreateSyncKHR"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglCreateSyncKHR")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(EGLBoolean, eglDestroySyncKHR, (EGLDisplay dpy, EGLSyncKHR sync))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglDestroySyncKHR"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglDestroySyncKHR")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(EGLint, eglClientWaitSyncKHR, (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglClientWaitSyncKHR"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglClientWaitSyncKHR")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(EGLBoolean, eglGetSyncAttribKHR, (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglGetSyncAttribKHR"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglGetSyncAttribKHR")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 
        _EVASGL_EXT_FUNCTION_BEGIN(EvasGLSync, evasglCreateSync, (Evas_GL *evas_gl, unsigned int type, const int *attrib_list))
@@ -1250,7 +1253,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_reusable_sync)
        _EVASGL_EXT_DRVNAME(EGL_KHR_reusable_sync)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(EGLBoolean, eglSignalSyncKHR, (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglSignalSyncKHR"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglSignalSyncKHR")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 
        _EVASGL_EXT_FUNCTION_BEGIN(Eina_Bool, evasglSignalSync, (Evas_GL *evas_gl, EvasGLSync sync, unsigned mode))
@@ -1264,7 +1267,7 @@ _EVASGL_EXT_BEGIN(EGL_KHR_wait_sync)
        _EVASGL_EXT_DRVNAME(EGL_KHR_wait_sync)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(EGLint, eglWaitSyncKHR, (EGLDisplay dpy, EGLSyncKHR sync, int flags))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglWaitSyncKHR"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglWaitSyncKHR")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 
        _EVASGL_EXT_FUNCTION_BEGIN(int, evasglWaitSync, (Evas_GL *evas_gl, EvasGLSync sync, int flags))
@@ -1279,10 +1282,10 @@ _EVASGL_EXT_BEGIN(EGL_SEC_map_image)
        _EVASGL_EXT_DRVNAME(EGL_SEC_map_image)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void *, eglMapImageSEC, void *a, void *b, int c, int d))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglMapImageSEC"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglMapImageSEC")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(unsigned int, eglUnmapImageSEC, void *a, void *b, int c))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("eglUnmapImageSEC"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("eglUnmapImageSEC")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 _EVASGL_EXT_END()
 #endif
@@ -1303,7 +1306,7 @@ _EVASGL_EXT_BEGIN(GLX_EXT_swap_control)
        _EVASGL_EXT_DRVNAME(GLX_EXT_swap_control)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void, glXSwapIntervalEXT, (Display *dpy, GLXDrawable drawable, int interval))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glXSwapIntervalEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glXSwapIntervalEXT")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 _EVASGL_EXT_END()
 
@@ -1311,7 +1314,7 @@ _EVASGL_EXT_BEGIN(GLX_SGI_swap_control)
        _EVASGL_EXT_DRVNAME(GLX_SGI_swap_control)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(int, glXSwapIntervalSGI, (int interval))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glXSwapIntervalSGI"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glXSwapIntervalSGI")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 _EVASGL_EXT_END()
 
@@ -1319,10 +1322,10 @@ _EVASGL_EXT_BEGIN(GLX_SGI_video_sync)
        _EVASGL_EXT_DRVNAME(GLX_SGI_video_sync)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(int, glXGetVideoSyncSGI, (uint *count))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glXGetVideoSyncSGI"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glXGetVideoSyncSGI")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(int, glXWaitVideoSyncSGI, (int divisor, int remainder, unsigned int *count))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glXWaitVideoSyncSGI"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glXWaitVideoSyncSGI")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 
 _EVASGL_EXT_END()
@@ -1331,10 +1334,10 @@ _EVASGL_EXT_BEGIN(GLX_EXT_texture_from_pixmap)
        _EVASGL_EXT_DRVNAME(GLX_EXT_texture_from_pixmap)
 
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void, glXBindTexImageEXT, (Display *display, GLXDrawable drawable, int buffer, const int *attrib_list))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glXBindTexImageEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glXBindTexImageEXT")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
        _EVASGL_EXT_FUNCTION_PRIVATE_BEGIN(void, glXReleaseTexImageEXT, (Display *display, GLXDrawable drawable, int buffer))
-               _EVASGL_EXT_FUNCTION_DRVFUNC(GETPROCADDR("glXReleaseTexImageEXT"))
+                _EVASGL_EXT_FUNCTION_DRVFUNC_PROCADDR("glXReleaseTexImageEXT")
        _EVASGL_EXT_FUNCTION_PRIVATE_END()
 
 _EVASGL_EXT_END()