[Title] Refactored symbol macros

[Issue#]
[Problem]
[Cause]
[Solution]
- Now ES2.0 extension functions use DDK's ES2.0 extension functions instead of DDK's ES3.0 functions
- Disabled dlog module in EGL/GLES2 wrappers

diff --git a/src/coregl.c b/src/coregl.c
index fe51db1..643349b 100755 (executable)
--- a/src/coregl.c
+++ b/src/coregl.c
@@ -21,7 +21,7 @@ void               *gl_lib_handle;
 #endif
 
 // Symbol definition for real
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_sym_##FUNC_NAME) PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_sym_##FUNC_NAME) PARAM_LIST;
 #include "headers/sym.h"
 #undef _COREGL_SYMBOL
 
@@ -94,7 +94,7 @@ static int
 _glue_sym_init(void)
 {
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) \
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) \
     FINDSYM(egl_lib_handle, _sym_eglGetProcAddress, _sym_##FUNC_NAME, #FUNC_NAME);
 #define _COREGL_EXT_SYMBOL_ALIAS(FUNC_NAME, ALIAS_NAME) \
     FINDSYM(egl_lib_handle, _sym_eglGetProcAddress, _sym_##ALIAS_NAME, #FUNC_NAME);
@@ -111,7 +111,7 @@ static int
 _gl_sym_init(void)
 {
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) \
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) \
     FINDSYM(gl_lib_handle, _sym_eglGetProcAddress, _sym_##FUNC_NAME, #FUNC_NAME);
 #define _COREGL_EXT_SYMBOL_ALIAS(FUNC_NAME, ALIAS_NAME) \
     FINDSYM(gl_lib_handle, _sym_eglGetProcAddress, _sym_##ALIAS_NAME, #FUNC_NAME);

diff --git a/src/coregl.h b/src/coregl.h
index 1554433..c94c0e3 100644 (file)
--- a/src/coregl.h
+++ b/src/coregl.h
@@ -11,8 +11,8 @@
 
 typedef void (*_eng_fn) (void);
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_API extern RET_TYPE coregl_api_##FUNC_NAME PARAM_LIST;
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_API extern RET_TYPE coregl_api_##FUNC_NAME PARAM_LIST;
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 #include "headers/sym.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL

diff --git a/src/coregl_export.c b/src/coregl_export.c
index b9310b0..166ccb0 100644 (file)
--- a/src/coregl_export.c
+++ b/src/coregl_export.c
@@ -1,6 +1,6 @@
 #include "coregl_export.h"
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*ovr_##FUNC_NAME) PARAM_LIST = NULL;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*ovr_##FUNC_NAME) PARAM_LIST = NULL;
 #include "headers/sym.h"
 #undef _COREGL_SYMBOL
 
@@ -16,11 +16,11 @@ _clean_overrides()
 {
 #define OVERRIDE(f) COREGL_OVERRIDE_API(ovr_, f, _sym_)
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     OVERRIDE(FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     OVERRIDE(FUNC_NAME);
 # include "headers/sym_egl.h"
 #undef _COREGL_SYMBOL
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     OVERRIDE(FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     OVERRIDE(FUNC_NAME);
 # include "headers/sym_gl.h"
 #undef _COREGL_SYMBOL
 

diff --git a/src/coregl_export.h b/src/coregl_export.h
index 4ea111a..e694eac 100644 (file)
--- a/src/coregl_export.h
+++ b/src/coregl_export.h
@@ -3,7 +3,7 @@
 
 #include "coregl_internal.h"
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*ovr_##FUNC_NAME) PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*ovr_##FUNC_NAME) PARAM_LIST;
 # include "headers/sym.h"
 #undef _COREGL_SYMBOL
 

diff --git a/src/coregl_internal.h b/src/coregl_internal.h
index c9990bf..dd89bc6 100644 (file)
--- a/src/coregl_internal.h
+++ b/src/coregl_internal.h
@@ -10,23 +10,19 @@
 #define unlikely(x) __builtin_expect(x, 0)
 
 // Symbol definition for real
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_sym_##FUNC_NAME) PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_sym_##FUNC_NAME) PARAM_LIST;
 # include "headers/sym.h"
 #undef _COREGL_SYMBOL
 
 #define COREGL_DEBUG
 
-#define LOG_TAG "CoreGL"
-#include <dlog.h>
-
 ///////////////////////////////////////
 // Disable dlog for debugging urgent issues //
 #ifdef COREGL_DEBUG
-# undef LOGE
+//# define LOG_TAG "CoreGL"
+//# include <dlog.h>
 # define LOGE(...) fprintf(stderr, __VA_ARGS__)
-# undef LOGW
 # define LOGW(...) fprintf(stderr, __VA_ARGS__)
-# undef LOGD
 # define LOGD(...) fprintf(stderr, __VA_ARGS__)
 #endif
 ///////////////////////////////////////

diff --git a/src/coregl_override.c b/src/coregl_override.c
index b1b5486..3355b65 100644 (file)
--- a/src/coregl_override.c
+++ b/src/coregl_override.c
@@ -8,11 +8,11 @@ init_overrides()
 {
 #define C_ORD(f) COREGL_OVERRIDE_API(ovr_, f, _sym_)
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     C_ORD(FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     C_ORD(FUNC_NAME);
 # include "headers/sym_egl.h"
 #undef _COREGL_SYMBOL
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     C_ORD(FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     C_ORD(FUNC_NAME);
 # include "headers/sym_gl.h"
 #undef _COREGL_SYMBOL
 

diff --git a/src/headers/sym_egl.h b/src/headers/sym_egl.h
index ab48a36..a089821 100644 (file)
--- a/src/headers/sym_egl.h
+++ b/src/headers/sym_egl.h
@@ -1,11 +1,11 @@
 // Defult use-case for exporting symbols
 #ifndef _COREGL_SYMBOL
 #define _COREGL_SYMBOL_NOT_DEFINED
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_API extern RET_TYPE FUNC_NAME PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_API extern RET_TYPE FUNC_NAME PARAM_LIST;
 #endif
 #ifndef _COREGL_EXT_SYMBOL
 #define _COREGL_EXT_SYMBOL_NOT_DEFINED
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)   _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)   _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 #endif
 #ifndef _COREGL_EXT_SYMBOL_ALIAS
 #define _COREGL_EXT_SYMBOL_ALIAS_NOT_DEFINED
@@ -22,62 +22,62 @@
 
 // Standard EGL APIs
 
-_COREGL_SYMBOL(GL_FALSE, EGLint, eglGetError, (void))
-_COREGL_SYMBOL(GL_FALSE, EGLDisplay, eglGetDisplay, (EGLNativeDisplayType display_id))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglInitialize, (EGLDisplay dpy, EGLint* major, EGLint *minor))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglTerminate, (EGLDisplay dpy))
-_COREGL_SYMBOL(GL_FALSE, const char*, eglQueryString, (EGLDisplay dpy, EGLint name))
-
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglGetConfigs, (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglChooseConfig, (EGLDisplay dpy, const EGLint* attrib_list, EGLConfig* configs, EGLint config_size, EGLint* num_config))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglGetConfigAttrib, (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value))
-
-_COREGL_SYMBOL(GL_FALSE, EGLSurface, eglCreateWindowSurface, (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint* attrib_list))
-_COREGL_SYMBOL(GL_FALSE, EGLSurface, eglCreatePbufferSurface, (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list))
-_COREGL_SYMBOL(GL_FALSE, EGLSurface, eglCreatePixmapSurface, (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint* attrib_list))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglDestroySurface, (EGLDisplay dpy, EGLSurface surface))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglQuerySurface, (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value))
-
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglBindAPI, (EGLenum api))
-_COREGL_SYMBOL(GL_FALSE, EGLenum, eglQueryAPI, (void))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglWaitClient, (void))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglReleaseThread, (void))
-_COREGL_SYMBOL(GL_FALSE, EGLSurface, eglCreatePbufferFromClientBuffer, (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list))
-
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglSurfaceAttrib, (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglBindTexImage, (EGLDisplay dpy, EGLSurface surface, EGLint buffer))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglReleaseTexImage, (EGLDisplay dpy, EGLSurface surface, EGLint buffer))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglSwapInterval, (EGLDisplay dpy, EGLint interval))
-_COREGL_SYMBOL(GL_FALSE, EGLContext, eglCreateContext, (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint* attrib_list))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglDestroyContext, (EGLDisplay dpy, EGLContext ctx))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglMakeCurrent, (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx))
-_COREGL_SYMBOL(GL_FALSE, EGLContext, eglGetCurrentContext, (void))
-_COREGL_SYMBOL(GL_FALSE, EGLSurface, eglGetCurrentSurface, (EGLint readdraw))
-_COREGL_SYMBOL(GL_FALSE, EGLDisplay, eglGetCurrentDisplay, (void))
-
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglQueryContext, (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglWaitGL, (void))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglWaitNative, (EGLint engine))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglSwapBuffers, (EGLDisplay dpy, EGLSurface surface))
-_COREGL_SYMBOL(GL_FALSE, EGLBoolean, eglCopyBuffers, (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target))
-
-_COREGL_SYMBOL(GL_FALSE, _eng_fn, eglGetProcAddress, (const char* procname))
+_COREGL_SYMBOL(EGLint, eglGetError, (void))
+_COREGL_SYMBOL(EGLDisplay, eglGetDisplay, (EGLNativeDisplayType display_id))
+_COREGL_SYMBOL(EGLBoolean, eglInitialize, (EGLDisplay dpy, EGLint* major, EGLint *minor))
+_COREGL_SYMBOL(EGLBoolean, eglTerminate, (EGLDisplay dpy))
+_COREGL_SYMBOL(const char*, eglQueryString, (EGLDisplay dpy, EGLint name))
+
+_COREGL_SYMBOL(EGLBoolean, eglGetConfigs, (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config))
+_COREGL_SYMBOL(EGLBoolean, eglChooseConfig, (EGLDisplay dpy, const EGLint* attrib_list, EGLConfig* configs, EGLint config_size, EGLint* num_config))
+_COREGL_SYMBOL(EGLBoolean, eglGetConfigAttrib, (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value))
+
+_COREGL_SYMBOL(EGLSurface, eglCreateWindowSurface, (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint* attrib_list))
+_COREGL_SYMBOL(EGLSurface, eglCreatePbufferSurface, (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list))
+_COREGL_SYMBOL(EGLSurface, eglCreatePixmapSurface, (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint* attrib_list))
+_COREGL_SYMBOL(EGLBoolean, eglDestroySurface, (EGLDisplay dpy, EGLSurface surface))
+_COREGL_SYMBOL(EGLBoolean, eglQuerySurface, (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value))
+
+_COREGL_SYMBOL(EGLBoolean, eglBindAPI, (EGLenum api))
+_COREGL_SYMBOL(EGLenum, eglQueryAPI, (void))
+_COREGL_SYMBOL(EGLBoolean, eglWaitClient, (void))
+_COREGL_SYMBOL(EGLBoolean, eglReleaseThread, (void))
+_COREGL_SYMBOL(EGLSurface, eglCreatePbufferFromClientBuffer, (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list))
+
+_COREGL_SYMBOL(EGLBoolean, eglSurfaceAttrib, (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value))
+_COREGL_SYMBOL(EGLBoolean, eglBindTexImage, (EGLDisplay dpy, EGLSurface surface, EGLint buffer))
+_COREGL_SYMBOL(EGLBoolean, eglReleaseTexImage, (EGLDisplay dpy, EGLSurface surface, EGLint buffer))
+_COREGL_SYMBOL(EGLBoolean, eglSwapInterval, (EGLDisplay dpy, EGLint interval))
+_COREGL_SYMBOL(EGLContext, eglCreateContext, (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint* attrib_list))
+_COREGL_SYMBOL(EGLBoolean, eglDestroyContext, (EGLDisplay dpy, EGLContext ctx))
+_COREGL_SYMBOL(EGLBoolean, eglMakeCurrent, (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx))
+_COREGL_SYMBOL(EGLContext, eglGetCurrentContext, (void))
+_COREGL_SYMBOL(EGLSurface, eglGetCurrentSurface, (EGLint readdraw))
+_COREGL_SYMBOL(EGLDisplay, eglGetCurrentDisplay, (void))
+
+_COREGL_SYMBOL(EGLBoolean, eglQueryContext, (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value))
+_COREGL_SYMBOL(EGLBoolean, eglWaitGL, (void))
+_COREGL_SYMBOL(EGLBoolean, eglWaitNative, (EGLint engine))
+_COREGL_SYMBOL(EGLBoolean, eglSwapBuffers, (EGLDisplay dpy, EGLSurface surface))
+_COREGL_SYMBOL(EGLBoolean, eglCopyBuffers, (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target))
+
+_COREGL_SYMBOL(_eng_fn, eglGetProcAddress, (const char* procname))
 
 
 // Extensions
-_COREGL_EXT_SYMBOL(GL_TRUE, EGLImageKHR, eglCreateImageKHR, (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list))
-_COREGL_EXT_SYMBOL(GL_TRUE, EGLBoolean, eglDestroyImageKHR, (EGLDisplay dpy, EGLImageKHR image))
+_COREGL_EXT_SYMBOL(EGLImageKHR, eglCreateImageKHR, (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list))
+_COREGL_EXT_SYMBOL(EGLBoolean, eglDestroyImageKHR, (EGLDisplay dpy, EGLImageKHR image))
 
-_COREGL_EXT_SYMBOL(GL_TRUE, void*, eglMapImageSEC, (EGLDisplay dpy, EGLImageKHR image, EGLint device_type, EGLint access_option))
-_COREGL_EXT_SYMBOL(GL_TRUE, EGLBoolean, eglUnmapImageSEC, (EGLDisplay dpy, EGLImageKHR image, EGLint device_type))
-_COREGL_EXT_SYMBOL(GL_TRUE, EGLBoolean, eglGetImageAttribSEC, (EGLDisplay dpy, EGLImageKHR image, EGLint attribute, EGLint *value))
+_COREGL_EXT_SYMBOL(void*, eglMapImageSEC, (EGLDisplay dpy, EGLImageKHR image, EGLint device_type, EGLint access_option))
+_COREGL_EXT_SYMBOL(EGLBoolean, eglUnmapImageSEC, (EGLDisplay dpy, EGLImageKHR image, EGLint device_type))
+_COREGL_EXT_SYMBOL(EGLBoolean, eglGetImageAttribSEC, (EGLDisplay dpy, EGLImageKHR image, EGLint attribute, EGLint *value))
 
-_COREGL_EXT_SYMBOL(GL_TRUE, EGLBoolean, eglLockSurfaceKHR, (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list))
-_COREGL_EXT_SYMBOL(GL_TRUE, EGLBoolean, eglUnlockSurfaceKHR, (EGLDisplay display, EGLSurface surface))
+_COREGL_EXT_SYMBOL(EGLBoolean, eglLockSurfaceKHR, (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list))
+_COREGL_EXT_SYMBOL(EGLBoolean, eglUnlockSurfaceKHR, (EGLDisplay display, EGLSurface surface))
 
-_COREGL_EXT_SYMBOL(GL_TRUE, EGLBoolean, eglSwapBuffersWithDamageEXT, (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects))
+_COREGL_EXT_SYMBOL(EGLBoolean, eglSwapBuffersWithDamageEXT, (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects))
 
-_COREGL_EXT_SYMBOL(GL_TRUE, EGLBoolean, eglSwapBuffersRegionEXT, (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects))
+_COREGL_EXT_SYMBOL(EGLBoolean, eglSwapBuffersRegionEXT, (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects))
 
 /* Fastpath Verified extensions */
 //_COREGL_EXT_SYMBOL_FASTPATH_PASS(eglSwapBuffersRegionSEC)

diff --git a/src/headers/sym_gl.h b/src/headers/sym_gl.h
index 5094be1..b84ad45 100644 (file)
--- a/src/headers/sym_gl.h
+++ b/src/headers/sym_gl.h
@@ -6,11 +6,11 @@
 // Defult use-case for exporting symbols
 #ifndef _COREGL_SYMBOL
 #define _COREGL_SYMBOL_NOT_DEFINED
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) COREGL_API extern RET_TYPE FUNC_NAME PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) COREGL_API extern RET_TYPE FUNC_NAME PARAM_LIST;
 #endif
 #ifndef _COREGL_EXT_SYMBOL
 #define _COREGL_EXT_SYMBOL_NOT_DEFINED
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 #endif
 #ifndef _COREGL_EXT_SYMBOL_ALIAS
 #define _COREGL_EXT_SYMBOL_ALIAS_NOT_DEFINED
@@ -30,266 +30,266 @@
 #endif
 
 /* OpenGL ES 2.0 */
-_COREGL_SYMBOL(GL_FALSE, void, glActiveTexture, (GLenum texture))
-_COREGL_SYMBOL(GL_FALSE, void, glAttachShader, (GLuint program, GLuint shader))
-_COREGL_SYMBOL(GL_FALSE, void, glBindAttribLocation, (GLuint program, GLuint index, const char* name))
-_COREGL_SYMBOL(GL_FALSE, void, glBindBuffer, (GLenum target, GLuint buffer))
-_COREGL_SYMBOL(GL_FALSE, void, glBindFramebuffer, (GLenum target, GLuint framebuffer))
-_COREGL_SYMBOL(GL_FALSE, void, glBindRenderbuffer, (GLenum target, GLuint renderbuffer))
-_COREGL_SYMBOL(GL_FALSE, void, glBindTexture, (GLenum target, GLuint texture))
-_COREGL_SYMBOL(GL_FALSE, void, glBlendColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha))
-_COREGL_SYMBOL(GL_FALSE, void, glBlendEquation, ( GLenum mode ))
-_COREGL_SYMBOL(GL_FALSE, void, glBlendEquationSeparate, (GLenum modeRGB, GLenum modeAlpha))
-_COREGL_SYMBOL(GL_FALSE, void, glBlendFunc, (GLenum sfactor, GLenum dfactor))
-_COREGL_SYMBOL(GL_FALSE, void, glBlendFuncSeparate, (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha))
-_COREGL_SYMBOL(GL_FALSE, void, glBufferData, (GLenum target, GLsizeiptr size, const void* data, GLenum usage))
-_COREGL_SYMBOL(GL_FALSE, void, glBufferSubData, (GLenum target, GLintptr offset, GLsizeiptr size, const void* data))
-_COREGL_SYMBOL(GL_FALSE, GLenum, glCheckFramebufferStatus, (GLenum target))
-_COREGL_SYMBOL(GL_FALSE, void, glClear, (GLbitfield mask))
-_COREGL_SYMBOL(GL_FALSE, void, glClearColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha))
-_COREGL_SYMBOL(GL_FALSE, void, glClearDepthf, (GLclampf depth))
-_COREGL_SYMBOL(GL_FALSE, void, glClearStencil, (GLint s))
-_COREGL_SYMBOL(GL_FALSE, void, glColorMask, (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha))
-_COREGL_SYMBOL(GL_FALSE, void, glCompileShader, (GLuint shader))
-_COREGL_SYMBOL(GL_FALSE, void, glCompressedTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data))
-_COREGL_SYMBOL(GL_FALSE, void, glCompressedTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data))
-_COREGL_SYMBOL(GL_FALSE, void, glCopyTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border))
-_COREGL_SYMBOL(GL_FALSE, void, glCopyTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height))
-_COREGL_SYMBOL(GL_FALSE, GLuint, glCreateProgram, (void))
-_COREGL_SYMBOL(GL_FALSE, GLuint, glCreateShader, (GLenum type))
-_COREGL_SYMBOL(GL_FALSE, void, glCullFace, (GLenum mode))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteBuffers, (GLsizei n, const GLuint* buffers))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteFramebuffers, (GLsizei n, const GLuint* framebuffers))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteProgram, (GLuint program))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteRenderbuffers, (GLsizei n, const GLuint* renderbuffers))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteShader, (GLuint shader))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteTextures, (GLsizei n, const GLuint* textures))
-_COREGL_SYMBOL(GL_FALSE, void, glDepthFunc, (GLenum func))
-_COREGL_SYMBOL(GL_FALSE, void, glDepthMask, (GLboolean flag))
-_COREGL_SYMBOL(GL_FALSE, void, glDepthRangef, (GLclampf zNear, GLclampf zFar))
-_COREGL_SYMBOL(GL_FALSE, void, glDetachShader, (GLuint program, GLuint shader))
-_COREGL_SYMBOL(GL_FALSE, void, glDisable, (GLenum cap))
-_COREGL_SYMBOL(GL_FALSE, void, glDisableVertexAttribArray, (GLuint index))
-_COREGL_SYMBOL(GL_FALSE, void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
-_COREGL_SYMBOL(GL_FALSE, void, glDrawElements, (GLenum mode, GLsizei count, GLenum type, const void* indices))
-_COREGL_SYMBOL(GL_FALSE, void, glEnable, (GLenum cap))
-_COREGL_SYMBOL(GL_FALSE, void, glEnableVertexAttribArray, (GLuint index))
-_COREGL_SYMBOL(GL_FALSE, void, glFinish, (void))
-_COREGL_SYMBOL(GL_FALSE, void, glFlush, (void))
-_COREGL_SYMBOL(GL_FALSE, void, glFramebufferRenderbuffer, (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer))
-_COREGL_SYMBOL(GL_FALSE, void, glFramebufferTexture2D, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level))
-_COREGL_SYMBOL(GL_FALSE, void, glFrontFace, (GLenum mode))
-_COREGL_SYMBOL(GL_FALSE, void, glGenBuffers, (GLsizei n, GLuint* buffers))
-_COREGL_SYMBOL(GL_FALSE, void, glGenerateMipmap, (GLenum target))
-_COREGL_SYMBOL(GL_FALSE, void, glGenFramebuffers, (GLsizei n, GLuint* framebuffers))
-_COREGL_SYMBOL(GL_FALSE, void, glGenRenderbuffers, (GLsizei n, GLuint* renderbuffers))
-_COREGL_SYMBOL(GL_FALSE, void, glGenTextures, (GLsizei n, GLuint* textures))
-_COREGL_SYMBOL(GL_FALSE, void, glGetActiveAttrib, (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name))
-_COREGL_SYMBOL(GL_FALSE, void, glGetActiveUniform, (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name))
-_COREGL_SYMBOL(GL_FALSE, void, glGetAttachedShaders, (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders))
-_COREGL_SYMBOL(GL_FALSE, int, glGetAttribLocation, (GLuint program, const char* name))
-_COREGL_SYMBOL(GL_FALSE, void, glGetBooleanv, (GLenum pname, GLboolean* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetBufferParameteriv, (GLenum target, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, GLenum, glGetError, (void))
-_COREGL_SYMBOL(GL_FALSE, void, glGetFloatv, (GLenum pname, GLfloat* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetFramebufferAttachmentParameteriv, (GLenum target, GLenum attachment, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetIntegerv, (GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetProgramiv, (GLuint program, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetProgramInfoLog, (GLuint program, GLsizei bufsize, GLsizei* length, char* infolog))
-_COREGL_SYMBOL(GL_FALSE, void, glGetRenderbufferParameteriv, (GLenum target, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetShaderiv, (GLuint shader, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetShaderInfoLog, (GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog))
-_COREGL_SYMBOL(GL_FALSE, void, glGetShaderPrecisionFormat, (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision))
-_COREGL_SYMBOL(GL_FALSE, void, glGetShaderSource, (GLuint shader, GLsizei bufsize, GLsizei* length, char* source))
-_COREGL_SYMBOL(GL_FALSE, const GLubyte *, glGetString, (GLenum name))
-_COREGL_SYMBOL(GL_FALSE, void, glGetTexParameterfv, (GLenum target, GLenum pname, GLfloat* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetTexParameteriv, (GLenum target, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetUniformfv, (GLuint program, GLint location, GLfloat* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetUniformiv, (GLuint program, GLint location, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, int, glGetUniformLocation, (GLuint program, const char* name))
-_COREGL_SYMBOL(GL_FALSE, void, glGetVertexAttribfv, (GLuint index, GLenum pname, GLfloat* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetVertexAttribiv, (GLuint index, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetVertexAttribPointerv, (GLuint index, GLenum pname, void** pointer))
-_COREGL_SYMBOL(GL_FALSE, void, glHint, (GLenum target, GLenum mode))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsBuffer, (GLuint buffer))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsEnabled, (GLenum cap))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsFramebuffer, (GLuint framebuffer))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsProgram, (GLuint program))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsRenderbuffer, (GLuint renderbuffer))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsShader, (GLuint shader))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsTexture, (GLuint texture))
-_COREGL_SYMBOL(GL_FALSE, void, glLineWidth, (GLfloat width))
-_COREGL_SYMBOL(GL_FALSE, void, glLinkProgram, (GLuint program))
-_COREGL_SYMBOL(GL_FALSE, void, glPixelStorei, (GLenum pname, GLint param))
-_COREGL_SYMBOL(GL_FALSE, void, glPolygonOffset, (GLfloat factor, GLfloat units))
-_COREGL_SYMBOL(GL_FALSE, void, glReadPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels))
-_COREGL_SYMBOL(GL_FALSE, void, glReleaseShaderCompiler, (void))
-_COREGL_SYMBOL(GL_FALSE, void, glRenderbufferStorage, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height))
-_COREGL_SYMBOL(GL_FALSE, void, glSampleCoverage, (GLclampf value, GLboolean invert))
-_COREGL_SYMBOL(GL_FALSE, void, glScissor, (GLint x, GLint y, GLsizei width, GLsizei height))
-_COREGL_SYMBOL(GL_FALSE, void, glShaderBinary, (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length))
-_COREGL_SYMBOL(GL_FALSE, void, glShaderSource, (GLuint shader, GLsizei count, const char** string, const GLint* length))
-_COREGL_SYMBOL(GL_FALSE, void, glStencilFunc, (GLenum func, GLint ref, GLuint mask))
-_COREGL_SYMBOL(GL_FALSE, void, glStencilFuncSeparate, (GLenum face, GLenum func, GLint ref, GLuint mask))
-_COREGL_SYMBOL(GL_FALSE, void, glStencilMask, (GLuint mask))
-_COREGL_SYMBOL(GL_FALSE, void, glStencilMaskSeparate, (GLenum face, GLuint mask))
-_COREGL_SYMBOL(GL_FALSE, void, glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass))
-_COREGL_SYMBOL(GL_FALSE, void, glStencilOpSeparate, (GLenum face, GLenum fail, GLenum zfail, GLenum zpass))
-_COREGL_SYMBOL(GL_FALSE, void, glTexImage2D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels))
-_COREGL_SYMBOL(GL_FALSE, void, glTexParameterf, (GLenum target, GLenum pname, GLfloat param))
-_COREGL_SYMBOL(GL_FALSE, void, glTexParameterfv, (GLenum target, GLenum pname, const GLfloat* params))
-_COREGL_SYMBOL(GL_FALSE, void, glTexParameteri, (GLenum target, GLenum pname, GLint param))
-_COREGL_SYMBOL(GL_FALSE, void, glTexParameteriv, (GLenum target, GLenum pname, const GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform1f, (GLint location, GLfloat x))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform1fv, (GLint location, GLsizei count, const GLfloat* v))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform1i, (GLint location, GLint x))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform1iv, (GLint location, GLsizei count, const GLint* v))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform2f, (GLint location, GLfloat x, GLfloat y))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform2fv, (GLint location, GLsizei count, const GLfloat* v))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform2i, (GLint location, GLint x, GLint y))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform2iv, (GLint location, GLsizei count, const GLint* v))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform3f, (GLint location, GLfloat x, GLfloat y, GLfloat z))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform3fv, (GLint location, GLsizei count, const GLfloat* v))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform3i, (GLint location, GLint x, GLint y, GLint z))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform3iv, (GLint location, GLsizei count, const GLint* v))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform4f, (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform4fv, (GLint location, GLsizei count, const GLfloat* v))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform4i, (GLint location, GLint x, GLint y, GLint z, GLint w))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform4iv, (GLint location, GLsizei count, const GLint* v))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUseProgram, (GLuint program))
-_COREGL_SYMBOL(GL_FALSE, void, glValidateProgram, (GLuint program))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttrib1f, (GLuint index, GLfloat x))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttrib1fv, (GLuint index, const GLfloat* values))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttrib2f, (GLuint index, GLfloat x, GLfloat y))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttrib2fv, (GLuint index, const GLfloat* values))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttrib3f, (GLuint index, GLfloat x, GLfloat y, GLfloat z))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttrib3fv, (GLuint index, const GLfloat* values))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttrib4f, (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttrib4fv, (GLuint index, const GLfloat* values))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttribPointer, (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer))
-_COREGL_SYMBOL(GL_FALSE, void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
+_COREGL_SYMBOL(void, glActiveTexture, (GLenum texture))
+_COREGL_SYMBOL(void, glAttachShader, (GLuint program, GLuint shader))
+_COREGL_SYMBOL(void, glBindAttribLocation, (GLuint program, GLuint index, const char* name))
+_COREGL_SYMBOL(void, glBindBuffer, (GLenum target, GLuint buffer))
+_COREGL_SYMBOL(void, glBindFramebuffer, (GLenum target, GLuint framebuffer))
+_COREGL_SYMBOL(void, glBindRenderbuffer, (GLenum target, GLuint renderbuffer))
+_COREGL_SYMBOL(void, glBindTexture, (GLenum target, GLuint texture))
+_COREGL_SYMBOL(void, glBlendColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha))
+_COREGL_SYMBOL(void, glBlendEquation, ( GLenum mode ))
+_COREGL_SYMBOL(void, glBlendEquationSeparate, (GLenum modeRGB, GLenum modeAlpha))
+_COREGL_SYMBOL(void, glBlendFunc, (GLenum sfactor, GLenum dfactor))
+_COREGL_SYMBOL(void, glBlendFuncSeparate, (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha))
+_COREGL_SYMBOL(void, glBufferData, (GLenum target, GLsizeiptr size, const void* data, GLenum usage))
+_COREGL_SYMBOL(void, glBufferSubData, (GLenum target, GLintptr offset, GLsizeiptr size, const void* data))
+_COREGL_SYMBOL(GLenum, glCheckFramebufferStatus, (GLenum target))
+_COREGL_SYMBOL(void, glClear, (GLbitfield mask))
+_COREGL_SYMBOL(void, glClearColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha))
+_COREGL_SYMBOL(void, glClearDepthf, (GLclampf depth))
+_COREGL_SYMBOL(void, glClearStencil, (GLint s))
+_COREGL_SYMBOL(void, glColorMask, (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha))
+_COREGL_SYMBOL(void, glCompileShader, (GLuint shader))
+_COREGL_SYMBOL(void, glCompressedTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data))
+_COREGL_SYMBOL(void, glCompressedTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data))
+_COREGL_SYMBOL(void, glCopyTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border))
+_COREGL_SYMBOL(void, glCopyTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height))
+_COREGL_SYMBOL(GLuint, glCreateProgram, (void))
+_COREGL_SYMBOL(GLuint, glCreateShader, (GLenum type))
+_COREGL_SYMBOL(void, glCullFace, (GLenum mode))
+_COREGL_SYMBOL(void, glDeleteBuffers, (GLsizei n, const GLuint* buffers))
+_COREGL_SYMBOL(void, glDeleteFramebuffers, (GLsizei n, const GLuint* framebuffers))
+_COREGL_SYMBOL(void, glDeleteProgram, (GLuint program))
+_COREGL_SYMBOL(void, glDeleteRenderbuffers, (GLsizei n, const GLuint* renderbuffers))
+_COREGL_SYMBOL(void, glDeleteShader, (GLuint shader))
+_COREGL_SYMBOL(void, glDeleteTextures, (GLsizei n, const GLuint* textures))
+_COREGL_SYMBOL(void, glDepthFunc, (GLenum func))
+_COREGL_SYMBOL(void, glDepthMask, (GLboolean flag))
+_COREGL_SYMBOL(void, glDepthRangef, (GLclampf zNear, GLclampf zFar))
+_COREGL_SYMBOL(void, glDetachShader, (GLuint program, GLuint shader))
+_COREGL_SYMBOL(void, glDisable, (GLenum cap))
+_COREGL_SYMBOL(void, glDisableVertexAttribArray, (GLuint index))
+_COREGL_SYMBOL(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
+_COREGL_SYMBOL(void, glDrawElements, (GLenum mode, GLsizei count, GLenum type, const void* indices))
+_COREGL_SYMBOL(void, glEnable, (GLenum cap))
+_COREGL_SYMBOL(void, glEnableVertexAttribArray, (GLuint index))
+_COREGL_SYMBOL(void, glFinish, (void))
+_COREGL_SYMBOL(void, glFlush, (void))
+_COREGL_SYMBOL(void, glFramebufferRenderbuffer, (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer))
+_COREGL_SYMBOL(void, glFramebufferTexture2D, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level))
+_COREGL_SYMBOL(void, glFrontFace, (GLenum mode))
+_COREGL_SYMBOL(void, glGenBuffers, (GLsizei n, GLuint* buffers))
+_COREGL_SYMBOL(void, glGenerateMipmap, (GLenum target))
+_COREGL_SYMBOL(void, glGenFramebuffers, (GLsizei n, GLuint* framebuffers))
+_COREGL_SYMBOL(void, glGenRenderbuffers, (GLsizei n, GLuint* renderbuffers))
+_COREGL_SYMBOL(void, glGenTextures, (GLsizei n, GLuint* textures))
+_COREGL_SYMBOL(void, glGetActiveAttrib, (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name))
+_COREGL_SYMBOL(void, glGetActiveUniform, (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name))
+_COREGL_SYMBOL(void, glGetAttachedShaders, (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders))
+_COREGL_SYMBOL(int, glGetAttribLocation, (GLuint program, const char* name))
+_COREGL_SYMBOL(void, glGetBooleanv, (GLenum pname, GLboolean* params))
+_COREGL_SYMBOL(void, glGetBufferParameteriv, (GLenum target, GLenum pname, GLint* params))
+_COREGL_SYMBOL(GLenum, glGetError, (void))
+_COREGL_SYMBOL(void, glGetFloatv, (GLenum pname, GLfloat* params))
+_COREGL_SYMBOL(void, glGetFramebufferAttachmentParameteriv, (GLenum target, GLenum attachment, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetIntegerv, (GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetProgramiv, (GLuint program, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetProgramInfoLog, (GLuint program, GLsizei bufsize, GLsizei* length, char* infolog))
+_COREGL_SYMBOL(void, glGetRenderbufferParameteriv, (GLenum target, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetShaderiv, (GLuint shader, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetShaderInfoLog, (GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog))
+_COREGL_SYMBOL(void, glGetShaderPrecisionFormat, (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision))
+_COREGL_SYMBOL(void, glGetShaderSource, (GLuint shader, GLsizei bufsize, GLsizei* length, char* source))
+_COREGL_SYMBOL(const GLubyte *, glGetString, (GLenum name))
+_COREGL_SYMBOL(void, glGetTexParameterfv, (GLenum target, GLenum pname, GLfloat* params))
+_COREGL_SYMBOL(void, glGetTexParameteriv, (GLenum target, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetUniformfv, (GLuint program, GLint location, GLfloat* params))
+_COREGL_SYMBOL(void, glGetUniformiv, (GLuint program, GLint location, GLint* params))
+_COREGL_SYMBOL(int, glGetUniformLocation, (GLuint program, const char* name))
+_COREGL_SYMBOL(void, glGetVertexAttribfv, (GLuint index, GLenum pname, GLfloat* params))
+_COREGL_SYMBOL(void, glGetVertexAttribiv, (GLuint index, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetVertexAttribPointerv, (GLuint index, GLenum pname, void** pointer))
+_COREGL_SYMBOL(void, glHint, (GLenum target, GLenum mode))
+_COREGL_SYMBOL(GLboolean, glIsBuffer, (GLuint buffer))
+_COREGL_SYMBOL(GLboolean, glIsEnabled, (GLenum cap))
+_COREGL_SYMBOL(GLboolean, glIsFramebuffer, (GLuint framebuffer))
+_COREGL_SYMBOL(GLboolean, glIsProgram, (GLuint program))
+_COREGL_SYMBOL(GLboolean, glIsRenderbuffer, (GLuint renderbuffer))
+_COREGL_SYMBOL(GLboolean, glIsShader, (GLuint shader))
+_COREGL_SYMBOL(GLboolean, glIsTexture, (GLuint texture))
+_COREGL_SYMBOL(void, glLineWidth, (GLfloat width))
+_COREGL_SYMBOL(void, glLinkProgram, (GLuint program))
+_COREGL_SYMBOL(void, glPixelStorei, (GLenum pname, GLint param))
+_COREGL_SYMBOL(void, glPolygonOffset, (GLfloat factor, GLfloat units))
+_COREGL_SYMBOL(void, glReadPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels))
+_COREGL_SYMBOL(void, glReleaseShaderCompiler, (void))
+_COREGL_SYMBOL(void, glRenderbufferStorage, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height))
+_COREGL_SYMBOL(void, glSampleCoverage, (GLclampf value, GLboolean invert))
+_COREGL_SYMBOL(void, glScissor, (GLint x, GLint y, GLsizei width, GLsizei height))
+_COREGL_SYMBOL(void, glShaderBinary, (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length))
+_COREGL_SYMBOL(void, glShaderSource, (GLuint shader, GLsizei count, const char** string, const GLint* length))
+_COREGL_SYMBOL(void, glStencilFunc, (GLenum func, GLint ref, GLuint mask))
+_COREGL_SYMBOL(void, glStencilFuncSeparate, (GLenum face, GLenum func, GLint ref, GLuint mask))
+_COREGL_SYMBOL(void, glStencilMask, (GLuint mask))
+_COREGL_SYMBOL(void, glStencilMaskSeparate, (GLenum face, GLuint mask))
+_COREGL_SYMBOL(void, glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass))
+_COREGL_SYMBOL(void, glStencilOpSeparate, (GLenum face, GLenum fail, GLenum zfail, GLenum zpass))
+_COREGL_SYMBOL(void, glTexImage2D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels))
+_COREGL_SYMBOL(void, glTexParameterf, (GLenum target, GLenum pname, GLfloat param))
+_COREGL_SYMBOL(void, glTexParameterfv, (GLenum target, GLenum pname, const GLfloat* params))
+_COREGL_SYMBOL(void, glTexParameteri, (GLenum target, GLenum pname, GLint param))
+_COREGL_SYMBOL(void, glTexParameteriv, (GLenum target, GLenum pname, const GLint* params))
+_COREGL_SYMBOL(void, glTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels))
+_COREGL_SYMBOL(void, glUniform1f, (GLint location, GLfloat x))
+_COREGL_SYMBOL(void, glUniform1fv, (GLint location, GLsizei count, const GLfloat* v))
+_COREGL_SYMBOL(void, glUniform1i, (GLint location, GLint x))
+_COREGL_SYMBOL(void, glUniform1iv, (GLint location, GLsizei count, const GLint* v))
+_COREGL_SYMBOL(void, glUniform2f, (GLint location, GLfloat x, GLfloat y))
+_COREGL_SYMBOL(void, glUniform2fv, (GLint location, GLsizei count, const GLfloat* v))
+_COREGL_SYMBOL(void, glUniform2i, (GLint location, GLint x, GLint y))
+_COREGL_SYMBOL(void, glUniform2iv, (GLint location, GLsizei count, const GLint* v))
+_COREGL_SYMBOL(void, glUniform3f, (GLint location, GLfloat x, GLfloat y, GLfloat z))
+_COREGL_SYMBOL(void, glUniform3fv, (GLint location, GLsizei count, const GLfloat* v))
+_COREGL_SYMBOL(void, glUniform3i, (GLint location, GLint x, GLint y, GLint z))
+_COREGL_SYMBOL(void, glUniform3iv, (GLint location, GLsizei count, const GLint* v))
+_COREGL_SYMBOL(void, glUniform4f, (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
+_COREGL_SYMBOL(void, glUniform4fv, (GLint location, GLsizei count, const GLfloat* v))
+_COREGL_SYMBOL(void, glUniform4i, (GLint location, GLint x, GLint y, GLint z, GLint w))
+_COREGL_SYMBOL(void, glUniform4iv, (GLint location, GLsizei count, const GLint* v))
+_COREGL_SYMBOL(void, glUniformMatrix2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glUniformMatrix3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glUniformMatrix4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glUseProgram, (GLuint program))
+_COREGL_SYMBOL(void, glValidateProgram, (GLuint program))
+_COREGL_SYMBOL(void, glVertexAttrib1f, (GLuint index, GLfloat x))
+_COREGL_SYMBOL(void, glVertexAttrib1fv, (GLuint index, const GLfloat* values))
+_COREGL_SYMBOL(void, glVertexAttrib2f, (GLuint index, GLfloat x, GLfloat y))
+_COREGL_SYMBOL(void, glVertexAttrib2fv, (GLuint index, const GLfloat* values))
+_COREGL_SYMBOL(void, glVertexAttrib3f, (GLuint index, GLfloat x, GLfloat y, GLfloat z))
+_COREGL_SYMBOL(void, glVertexAttrib3fv, (GLuint index, const GLfloat* values))
+_COREGL_SYMBOL(void, glVertexAttrib4f, (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
+_COREGL_SYMBOL(void, glVertexAttrib4fv, (GLuint index, const GLfloat* values))
+_COREGL_SYMBOL(void, glVertexAttribPointer, (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer))
+_COREGL_SYMBOL(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
 
 /* OpenGL ES 3.0 */
-_COREGL_SYMBOL(GL_FALSE, void, glReadBuffer, (GLenum mode))
-_COREGL_SYMBOL(GL_FALSE, void, glDrawRangeElements, (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices))
-_COREGL_SYMBOL(GL_FALSE, void, glTexImage3D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels))
-_COREGL_SYMBOL(GL_FALSE, void, glTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels))
-_COREGL_SYMBOL(GL_FALSE, void, glCopyTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height))
-_COREGL_SYMBOL(GL_FALSE, void, glCompressedTexImage3D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data))
-_COREGL_SYMBOL(GL_FALSE, void, glCompressedTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data))
-_COREGL_SYMBOL(GL_FALSE, void, glGenQueries, (GLsizei n, GLuint* ids))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteQueries, (GLsizei n, const GLuint* ids))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsQuery, (GLuint id))
-_COREGL_SYMBOL(GL_FALSE, void, glBeginQuery, (GLenum target, GLuint id))
-_COREGL_SYMBOL(GL_FALSE, void, glEndQuery, (GLenum target))
-_COREGL_SYMBOL(GL_FALSE, void, glGetQueryiv, (GLenum target, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetQueryObjectuiv, (GLuint id, GLenum pname, GLuint* params))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glUnmapBuffer, (GLenum target))
-_COREGL_SYMBOL(GL_FALSE, void, glGetBufferPointerv, (GLenum target, GLenum pname, GLvoid** params))
-_COREGL_SYMBOL(GL_FALSE, void, glDrawBuffers, (GLsizei n, const GLenum* bufs))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix2x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix3x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix2x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix4x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix3x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformMatrix4x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glBlitFramebuffer, (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter))
-_COREGL_SYMBOL(GL_FALSE, void, glRenderbufferStorageMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height))
-_COREGL_SYMBOL(GL_FALSE, void, glFramebufferTextureLayer, (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer))
-_COREGL_SYMBOL(GL_FALSE, GLvoid*, glMapBufferRange, (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access))
-_COREGL_SYMBOL(GL_FALSE, void, glFlushMappedBufferRange, (GLenum target, GLintptr offset, GLsizeiptr length))
-_COREGL_SYMBOL(GL_FALSE, void, glBindVertexArray, (GLuint array))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteVertexArrays, (GLsizei n, const GLuint* arrays))
-_COREGL_SYMBOL(GL_FALSE, void, glGenVertexArrays, (GLsizei n, GLuint* arrays))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsVertexArray, (GLuint array))
-_COREGL_SYMBOL(GL_FALSE, void, glGetIntegeri_v, (GLenum target, GLuint index, GLint* data))
-_COREGL_SYMBOL(GL_FALSE, void, glBeginTransformFeedback, (GLenum primitiveMode))
-_COREGL_SYMBOL(GL_FALSE, void, glEndTransformFeedback, (void))
-_COREGL_SYMBOL(GL_FALSE, void, glBindBufferRange, (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size))
-_COREGL_SYMBOL(GL_FALSE, void, glBindBufferBase, (GLenum target, GLuint index, GLuint buffer))
-_COREGL_SYMBOL(GL_FALSE, void, glTransformFeedbackVaryings, (GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode))
-_COREGL_SYMBOL(GL_FALSE, void, glGetTransformFeedbackVarying, (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttribIPointer, (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer))
-_COREGL_SYMBOL(GL_FALSE, void, glGetVertexAttribIiv, (GLuint index, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetVertexAttribIuiv, (GLuint index, GLenum pname, GLuint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttribI4i, (GLuint index, GLint x, GLint y, GLint z, GLint w))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttribI4ui, (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttribI4iv, (GLuint index, const GLint* v))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttribI4uiv, (GLuint index, const GLuint* v))
-_COREGL_SYMBOL(GL_FALSE, void, glGetUniformuiv, (GLuint program, GLint location, GLuint* params))
-_COREGL_SYMBOL(GL_FALSE, GLint, glGetFragDataLocation, (GLuint program, const GLchar *name))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform1ui, (GLint location, GLuint v0))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform2ui, (GLint location, GLuint v0, GLuint v1))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform3ui, (GLint location, GLuint v0, GLuint v1, GLuint v2))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform4ui, (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform1uiv, (GLint location, GLsizei count, const GLuint* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform2uiv, (GLint location, GLsizei count, const GLuint* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform3uiv, (GLint location, GLsizei count, const GLuint* value))
-_COREGL_SYMBOL(GL_FALSE, void, glUniform4uiv, (GLint location, GLsizei count, const GLuint* value))
-_COREGL_SYMBOL(GL_FALSE, void, glClearBufferiv, (GLenum buffer, GLint drawbuffer, const GLint* value))
-_COREGL_SYMBOL(GL_FALSE, void, glClearBufferuiv, (GLenum buffer, GLint drawbuffer, const GLuint* value))
-_COREGL_SYMBOL(GL_FALSE, void, glClearBufferfv, (GLenum buffer, GLint drawbuffer, const GLfloat* value))
-_COREGL_SYMBOL(GL_FALSE, void, glClearBufferfi, (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil))
-_COREGL_SYMBOL(GL_FALSE, const GLubyte*, glGetStringi, (GLenum name, GLuint index))
-_COREGL_SYMBOL(GL_FALSE, void, glCopyBufferSubData, (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size))
-_COREGL_SYMBOL(GL_FALSE, void, glGetUniformIndices, (GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices))
-_COREGL_SYMBOL(GL_FALSE, void, glGetActiveUniformsiv, (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, GLuint, glGetUniformBlockIndex, (GLuint program, const GLchar* uniformBlockName))
-_COREGL_SYMBOL(GL_FALSE, void, glGetActiveUniformBlockiv, (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetActiveUniformBlockName, (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName))
-_COREGL_SYMBOL(GL_FALSE, void, glUniformBlockBinding, (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding))
-_COREGL_SYMBOL(GL_FALSE, void, glDrawArraysInstanced, (GLenum mode, GLint first, GLsizei count, GLsizei instanceCount))
-_COREGL_SYMBOL(GL_FALSE, void, glDrawElementsInstanced, (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount))
-_COREGL_SYMBOL(GL_FALSE, GLsync, glFenceSync, (GLenum condition, GLbitfield flags))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsSync, (GLsync sync))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteSync, (GLsync sync))
-_COREGL_SYMBOL(GL_FALSE, GLenum, glClientWaitSync, (GLsync sync, GLbitfield flags, GLuint64 timeout))
-_COREGL_SYMBOL(GL_FALSE, void, glWaitSync, (GLsync sync, GLbitfield flags, GLuint64 timeout))
-_COREGL_SYMBOL(GL_FALSE, void, glGetInteger64v, (GLenum pname, GLint64* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetSynciv, (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values))
-_COREGL_SYMBOL(GL_FALSE, void, glGetInteger64i_v, (GLenum target, GLuint index, GLint64* data))
-_COREGL_SYMBOL(GL_FALSE, void, glGetBufferParameteri64v, (GLenum target, GLenum pname, GLint64* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGenSamplers, (GLsizei n, GLuint* samplers))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteSamplers, (GLsizei n, const GLuint* samplers))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsSampler, (GLuint sampler))
-_COREGL_SYMBOL(GL_FALSE, void, glBindSampler, (GLuint unit, GLuint sampler))
-_COREGL_SYMBOL(GL_FALSE, void, glSamplerParameteri, (GLuint sampler, GLenum pname, GLint param))
-_COREGL_SYMBOL(GL_FALSE, void, glSamplerParameteriv, (GLuint sampler, GLenum pname, const GLint* param))
-_COREGL_SYMBOL(GL_FALSE, void, glSamplerParameterf, (GLuint sampler, GLenum pname, GLfloat param))
-_COREGL_SYMBOL(GL_FALSE, void, glSamplerParameterfv, (GLuint sampler, GLenum pname, const GLfloat* param))
-_COREGL_SYMBOL(GL_FALSE, void, glGetSamplerParameteriv, (GLuint sampler, GLenum pname, GLint* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGetSamplerParameterfv, (GLuint sampler, GLenum pname, GLfloat* params))
-_COREGL_SYMBOL(GL_FALSE, void, glVertexAttribDivisor, (GLuint index, GLuint divisor))
-_COREGL_SYMBOL(GL_FALSE, void, glBindTransformFeedback, (GLenum target, GLuint id))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteTransformFeedbacks, (GLsizei n, const GLuint* ids))
-_COREGL_SYMBOL(GL_FALSE, void, glGenTransformFeedbacks, (GLsizei n, GLuint* ids))
-_COREGL_SYMBOL(GL_FALSE, GLboolean, glIsTransformFeedback, (GLuint id))
-_COREGL_SYMBOL(GL_FALSE, void, glPauseTransformFeedback, (void))
-_COREGL_SYMBOL(GL_FALSE, void, glResumeTransformFeedback, (void))
-_COREGL_SYMBOL(GL_FALSE, void, glGetProgramBinary, (GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary))
-_COREGL_SYMBOL(GL_FALSE, void, glProgramBinary, (GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length))
-_COREGL_SYMBOL(GL_FALSE, void, glProgramParameteri, (GLuint program, GLenum pname, GLint value))
-_COREGL_SYMBOL(GL_FALSE, void, glInvalidateFramebuffer, (GLenum target, GLsizei numAttachments, const GLenum* attachments))
-_COREGL_SYMBOL(GL_FALSE, void, glInvalidateSubFramebuffer, (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height))
-_COREGL_SYMBOL(GL_FALSE, void, glTexStorage2D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height))
-_COREGL_SYMBOL(GL_FALSE, void, glTexStorage3D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth))
-_COREGL_SYMBOL(GL_FALSE, void, glGetInternalformativ, (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params))
+_COREGL_SYMBOL(void, glReadBuffer, (GLenum mode))
+_COREGL_SYMBOL(void, glDrawRangeElements, (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices))
+_COREGL_SYMBOL(void, glTexImage3D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels))
+_COREGL_SYMBOL(void, glTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels))
+_COREGL_SYMBOL(void, glCopyTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height))
+_COREGL_SYMBOL(void, glCompressedTexImage3D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data))
+_COREGL_SYMBOL(void, glCompressedTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data))
+_COREGL_SYMBOL(void, glGenQueries, (GLsizei n, GLuint* ids))
+_COREGL_SYMBOL(void, glDeleteQueries, (GLsizei n, const GLuint* ids))
+_COREGL_SYMBOL(GLboolean, glIsQuery, (GLuint id))
+_COREGL_SYMBOL(void, glBeginQuery, (GLenum target, GLuint id))
+_COREGL_SYMBOL(void, glEndQuery, (GLenum target))
+_COREGL_SYMBOL(void, glGetQueryiv, (GLenum target, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetQueryObjectuiv, (GLuint id, GLenum pname, GLuint* params))
+_COREGL_SYMBOL(GLboolean, glUnmapBuffer, (GLenum target))
+_COREGL_SYMBOL(void, glGetBufferPointerv, (GLenum target, GLenum pname, GLvoid** params))
+_COREGL_SYMBOL(void, glDrawBuffers, (GLsizei n, const GLenum* bufs))
+_COREGL_SYMBOL(void, glUniformMatrix2x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glUniformMatrix3x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glUniformMatrix2x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glUniformMatrix4x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glUniformMatrix3x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glUniformMatrix4x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value))
+_COREGL_SYMBOL(void, glBlitFramebuffer, (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter))
+_COREGL_SYMBOL(void, glRenderbufferStorageMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height))
+_COREGL_SYMBOL(void, glFramebufferTextureLayer, (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer))
+_COREGL_SYMBOL(GLvoid*, glMapBufferRange, (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access))
+_COREGL_SYMBOL(void, glFlushMappedBufferRange, (GLenum target, GLintptr offset, GLsizeiptr length))
+_COREGL_SYMBOL(void, glBindVertexArray, (GLuint array))
+_COREGL_SYMBOL(void, glDeleteVertexArrays, (GLsizei n, const GLuint* arrays))
+_COREGL_SYMBOL(void, glGenVertexArrays, (GLsizei n, GLuint* arrays))
+_COREGL_SYMBOL(GLboolean, glIsVertexArray, (GLuint array))
+_COREGL_SYMBOL(void, glGetIntegeri_v, (GLenum target, GLuint index, GLint* data))
+_COREGL_SYMBOL(void, glBeginTransformFeedback, (GLenum primitiveMode))
+_COREGL_SYMBOL(void, glEndTransformFeedback, (void))
+_COREGL_SYMBOL(void, glBindBufferRange, (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size))
+_COREGL_SYMBOL(void, glBindBufferBase, (GLenum target, GLuint index, GLuint buffer))
+_COREGL_SYMBOL(void, glTransformFeedbackVaryings, (GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode))
+_COREGL_SYMBOL(void, glGetTransformFeedbackVarying, (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name))
+_COREGL_SYMBOL(void, glVertexAttribIPointer, (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer))
+_COREGL_SYMBOL(void, glGetVertexAttribIiv, (GLuint index, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetVertexAttribIuiv, (GLuint index, GLenum pname, GLuint* params))
+_COREGL_SYMBOL(void, glVertexAttribI4i, (GLuint index, GLint x, GLint y, GLint z, GLint w))
+_COREGL_SYMBOL(void, glVertexAttribI4ui, (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w))
+_COREGL_SYMBOL(void, glVertexAttribI4iv, (GLuint index, const GLint* v))
+_COREGL_SYMBOL(void, glVertexAttribI4uiv, (GLuint index, const GLuint* v))
+_COREGL_SYMBOL(void, glGetUniformuiv, (GLuint program, GLint location, GLuint* params))
+_COREGL_SYMBOL(GLint, glGetFragDataLocation, (GLuint program, const GLchar *name))
+_COREGL_SYMBOL(void, glUniform1ui, (GLint location, GLuint v0))
+_COREGL_SYMBOL(void, glUniform2ui, (GLint location, GLuint v0, GLuint v1))
+_COREGL_SYMBOL(void, glUniform3ui, (GLint location, GLuint v0, GLuint v1, GLuint v2))
+_COREGL_SYMBOL(void, glUniform4ui, (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3))
+_COREGL_SYMBOL(void, glUniform1uiv, (GLint location, GLsizei count, const GLuint* value))
+_COREGL_SYMBOL(void, glUniform2uiv, (GLint location, GLsizei count, const GLuint* value))
+_COREGL_SYMBOL(void, glUniform3uiv, (GLint location, GLsizei count, const GLuint* value))
+_COREGL_SYMBOL(void, glUniform4uiv, (GLint location, GLsizei count, const GLuint* value))
+_COREGL_SYMBOL(void, glClearBufferiv, (GLenum buffer, GLint drawbuffer, const GLint* value))
+_COREGL_SYMBOL(void, glClearBufferuiv, (GLenum buffer, GLint drawbuffer, const GLuint* value))
+_COREGL_SYMBOL(void, glClearBufferfv, (GLenum buffer, GLint drawbuffer, const GLfloat* value))
+_COREGL_SYMBOL(void, glClearBufferfi, (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil))
+_COREGL_SYMBOL(const GLubyte*, glGetStringi, (GLenum name, GLuint index))
+_COREGL_SYMBOL(void, glCopyBufferSubData, (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size))
+_COREGL_SYMBOL(void, glGetUniformIndices, (GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices))
+_COREGL_SYMBOL(void, glGetActiveUniformsiv, (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params))
+_COREGL_SYMBOL(GLuint, glGetUniformBlockIndex, (GLuint program, const GLchar* uniformBlockName))
+_COREGL_SYMBOL(void, glGetActiveUniformBlockiv, (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetActiveUniformBlockName, (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName))
+_COREGL_SYMBOL(void, glUniformBlockBinding, (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding))
+_COREGL_SYMBOL(void, glDrawArraysInstanced, (GLenum mode, GLint first, GLsizei count, GLsizei instanceCount))
+_COREGL_SYMBOL(void, glDrawElementsInstanced, (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount))
+_COREGL_SYMBOL(GLsync, glFenceSync, (GLenum condition, GLbitfield flags))
+_COREGL_SYMBOL(GLboolean, glIsSync, (GLsync sync))
+_COREGL_SYMBOL(void, glDeleteSync, (GLsync sync))
+_COREGL_SYMBOL(GLenum, glClientWaitSync, (GLsync sync, GLbitfield flags, GLuint64 timeout))
+_COREGL_SYMBOL(void, glWaitSync, (GLsync sync, GLbitfield flags, GLuint64 timeout))
+_COREGL_SYMBOL(void, glGetInteger64v, (GLenum pname, GLint64* params))
+_COREGL_SYMBOL(void, glGetSynciv, (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values))
+_COREGL_SYMBOL(void, glGetInteger64i_v, (GLenum target, GLuint index, GLint64* data))
+_COREGL_SYMBOL(void, glGetBufferParameteri64v, (GLenum target, GLenum pname, GLint64* params))
+_COREGL_SYMBOL(void, glGenSamplers, (GLsizei n, GLuint* samplers))
+_COREGL_SYMBOL(void, glDeleteSamplers, (GLsizei n, const GLuint* samplers))
+_COREGL_SYMBOL(GLboolean, glIsSampler, (GLuint sampler))
+_COREGL_SYMBOL(void, glBindSampler, (GLuint unit, GLuint sampler))
+_COREGL_SYMBOL(void, glSamplerParameteri, (GLuint sampler, GLenum pname, GLint param))
+_COREGL_SYMBOL(void, glSamplerParameteriv, (GLuint sampler, GLenum pname, const GLint* param))
+_COREGL_SYMBOL(void, glSamplerParameterf, (GLuint sampler, GLenum pname, GLfloat param))
+_COREGL_SYMBOL(void, glSamplerParameterfv, (GLuint sampler, GLenum pname, const GLfloat* param))
+_COREGL_SYMBOL(void, glGetSamplerParameteriv, (GLuint sampler, GLenum pname, GLint* params))
+_COREGL_SYMBOL(void, glGetSamplerParameterfv, (GLuint sampler, GLenum pname, GLfloat* params))
+_COREGL_SYMBOL(void, glVertexAttribDivisor, (GLuint index, GLuint divisor))
+_COREGL_SYMBOL(void, glBindTransformFeedback, (GLenum target, GLuint id))
+_COREGL_SYMBOL(void, glDeleteTransformFeedbacks, (GLsizei n, const GLuint* ids))
+_COREGL_SYMBOL(void, glGenTransformFeedbacks, (GLsizei n, GLuint* ids))
+_COREGL_SYMBOL(GLboolean, glIsTransformFeedback, (GLuint id))
+_COREGL_SYMBOL(void, glPauseTransformFeedback, (void))
+_COREGL_SYMBOL(void, glResumeTransformFeedback, (void))
+_COREGL_SYMBOL(void, glGetProgramBinary, (GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary))
+_COREGL_SYMBOL(void, glProgramBinary, (GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length))
+_COREGL_SYMBOL(void, glProgramParameteri, (GLuint program, GLenum pname, GLint value))
+_COREGL_SYMBOL(void, glInvalidateFramebuffer, (GLenum target, GLsizei numAttachments, const GLenum* attachments))
+_COREGL_SYMBOL(void, glInvalidateSubFramebuffer, (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height))
+_COREGL_SYMBOL(void, glTexStorage2D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height))
+_COREGL_SYMBOL(void, glTexStorage3D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth))
+_COREGL_SYMBOL(void, glGetInternalformativ, (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params))
 
 
 /* Extensions */
 
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_OES_EGL_image", 1.1, -1)
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glEGLImageTargetTexture2DOES, (GLenum target, GLeglImageOES image))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glEGLImageTargetRenderbufferStorageOES, (GLenum target, GLeglImageOES image))
+_COREGL_EXT_SYMBOL(void, glEGLImageTargetTexture2DOES, (GLenum target, GLeglImageOES image))
+_COREGL_EXT_SYMBOL(void, glEGLImageTargetRenderbufferStorageOES, (GLenum target, GLeglImageOES image))
 //_COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_OES_EGL_image_external", 1.1, -1)
 
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_OES_get_program_binary", 2.0, -1)
-_COREGL_EXT_SYMBOL_ALIAS(glGetProgramBinaryOES, glGetProgramBinary) // Replaced to ES 3.0 API
-_COREGL_EXT_SYMBOL_ALIAS(glProgramBinaryOES, glProgramBinary) // Replaced to ES 3.0 API
+_COREGL_EXT_SYMBOL(void, glGetProgramBinaryOES, (GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary))
+_COREGL_EXT_SYMBOL(void, glProgramBinaryOES, (GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length))
 
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_AMD_program_binary_Z400", 2.0, -1)
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_IMG_program_binary ", 2.0, -1)
@@ -297,63 +297,63 @@ _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_ARM_mali_program_binary", 2.0, -1)
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_ANGLE_program_binary", 2.0, -1)
 
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_EXT_separate_shader_objects", 2.0, -1)
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glUseProgramStagesEXT, (GLuint pipeline, GLbitfield stages, GLuint program))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glActiveShaderProgramEXT, (GLuint pipeline, GLuint program))
-_COREGL_EXT_SYMBOL(GL_TRUE, GLuint, glCreateShaderProgramvEXT, (GLenum type, GLsizei count, const char **strings))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glBindProgramPipelineEXT, (GLuint pipeline))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glDeleteProgramPipelinesEXT, (GLsizei n, const GLuint *pipelines))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glGenProgramPipelinesEXT, (GLsizei n, GLuint *pipelines))
-_COREGL_EXT_SYMBOL(GL_TRUE, GLboolean, glIsProgramPipelineEXT, (GLuint pipeline))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramParameteriEXT, (GLuint program, GLenum pname, GLint value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glGetProgramPipelineivEXT, (GLuint pipeline, GLenum pname, GLint *params))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform1iEXT, (GLuint program, GLint location, GLint x))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform2iEXT, (GLuint program, GLint location, GLint x, GLint y))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform3iEXT, (GLuint program, GLint location, GLint x, GLint y, GLint z))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform4iEXT, (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform1fEXT, (GLuint program, GLint location, GLfloat x))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform2fEXT, (GLuint program, GLint location, GLfloat x, GLfloat y))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform3fEXT, (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform4fEXT, (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform1ivEXT, (GLuint program, GLint location, GLsizei count, const GLint *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform2ivEXT, (GLuint program, GLint location, GLsizei count, const GLint *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform3ivEXT, (GLuint program, GLint location, GLsizei count, const GLint *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform4ivEXT, (GLuint program, GLint location, GLsizei count, const GLint *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform1fvEXT, (GLuint program, GLint location, GLsizei count, const GLfloat *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform2fvEXT, (GLuint program, GLint location, GLsizei count, const GLfloat *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform3fvEXT, (GLuint program, GLint location, GLsizei count, const GLfloat *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniform4fvEXT, (GLuint program, GLint location, GLsizei count, const GLfloat *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniformMatrix2fvEXT, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniformMatrix3fvEXT, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glProgramUniformMatrix4fvEXT, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glValidateProgramPipelineEXT, (GLuint pipeline))
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glGetProgramPipelineInfoLogEXT, (GLuint pipeline, GLsizei bufSize, GLsizei *length, char *infoLog))
+_COREGL_EXT_SYMBOL(void, glUseProgramStagesEXT, (GLuint pipeline, GLbitfield stages, GLuint program))
+_COREGL_EXT_SYMBOL(void, glActiveShaderProgramEXT, (GLuint pipeline, GLuint program))
+_COREGL_EXT_SYMBOL(GLuint, glCreateShaderProgramvEXT, (GLenum type, GLsizei count, const char **strings))
+_COREGL_EXT_SYMBOL(void, glBindProgramPipelineEXT, (GLuint pipeline))
+_COREGL_EXT_SYMBOL(void, glDeleteProgramPipelinesEXT, (GLsizei n, const GLuint *pipelines))
+_COREGL_EXT_SYMBOL(void, glGenProgramPipelinesEXT, (GLsizei n, GLuint *pipelines))
+_COREGL_EXT_SYMBOL(GLboolean, glIsProgramPipelineEXT, (GLuint pipeline))
+_COREGL_EXT_SYMBOL(void, glProgramParameteriEXT, (GLuint program, GLenum pname, GLint value))
+_COREGL_EXT_SYMBOL(void, glGetProgramPipelineivEXT, (GLuint pipeline, GLenum pname, GLint *params))
+_COREGL_EXT_SYMBOL(void, glProgramUniform1iEXT, (GLuint program, GLint location, GLint x))
+_COREGL_EXT_SYMBOL(void, glProgramUniform2iEXT, (GLuint program, GLint location, GLint x, GLint y))
+_COREGL_EXT_SYMBOL(void, glProgramUniform3iEXT, (GLuint program, GLint location, GLint x, GLint y, GLint z))
+_COREGL_EXT_SYMBOL(void, glProgramUniform4iEXT, (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w))
+_COREGL_EXT_SYMBOL(void, glProgramUniform1fEXT, (GLuint program, GLint location, GLfloat x))
+_COREGL_EXT_SYMBOL(void, glProgramUniform2fEXT, (GLuint program, GLint location, GLfloat x, GLfloat y))
+_COREGL_EXT_SYMBOL(void, glProgramUniform3fEXT, (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z))
+_COREGL_EXT_SYMBOL(void, glProgramUniform4fEXT, (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
+_COREGL_EXT_SYMBOL(void, glProgramUniform1ivEXT, (GLuint program, GLint location, GLsizei count, const GLint *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniform2ivEXT, (GLuint program, GLint location, GLsizei count, const GLint *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniform3ivEXT, (GLuint program, GLint location, GLsizei count, const GLint *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniform4ivEXT, (GLuint program, GLint location, GLsizei count, const GLint *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniform1fvEXT, (GLuint program, GLint location, GLsizei count, const GLfloat *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniform2fvEXT, (GLuint program, GLint location, GLsizei count, const GLfloat *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniform3fvEXT, (GLuint program, GLint location, GLsizei count, const GLfloat *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniform4fvEXT, (GLuint program, GLint location, GLsizei count, const GLfloat *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniformMatrix2fvEXT, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniformMatrix3fvEXT, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value))
+_COREGL_EXT_SYMBOL(void, glProgramUniformMatrix4fvEXT, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value))
+_COREGL_EXT_SYMBOL(void, glValidateProgramPipelineEXT, (GLuint pipeline))
+_COREGL_EXT_SYMBOL(void, glGetProgramPipelineInfoLogEXT, (GLuint pipeline, GLsizei bufSize, GLsizei *length, char *infoLog))
 
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_EXT_multisampled_render_to_texture", 2.0, -1)
-_COREGL_EXT_SYMBOL_ALIAS(glRenderbufferStorageMultisampleEXT, glRenderbufferStorageMultisample) // Replaced to ES 3.0 API
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glFramebufferTexture2DMultisampleEXT, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples))
+_COREGL_EXT_SYMBOL(void, glRenderbufferStorageMultisampleEXT, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height))
+_COREGL_EXT_SYMBOL(void, glFramebufferTexture2DMultisampleEXT, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples))
 
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_EXT_discard_framebuffer", 1.0, -1)
-_COREGL_EXT_SYMBOL_ALIAS(glDiscardFramebufferEXT, glInvalidateFramebuffer) // Replaced to ES 3.0 API
+_COREGL_EXT_SYMBOL(void, glDiscardFramebufferEXT, (GLenum target, GLsizei numAttachments, const GLenum* attachments))
 
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_OES_texture_3D", 2.0, -1)
-_COREGL_EXT_SYMBOL_ALIAS(glTexImage3DOES, glTexImage3D) // Replaced to ES 3.0 API
-_COREGL_EXT_SYMBOL_ALIAS(glTexSubImage3DOES, glTexSubImage3D) // Replaced to ES 3.0 API
-_COREGL_EXT_SYMBOL_ALIAS(glCopyTexSubImage3DOES, glCopyTexSubImage3D) // Replaced to ES 3.0 API
-_COREGL_EXT_SYMBOL_ALIAS(glCompressedTexImage3DOES, glCompressedTexImage3D) // Replaced to ES 3.0 API
-_COREGL_EXT_SYMBOL_ALIAS(glCompressedTexSubImage3DOES, glCompressedTexSubImage3D) // Replaced to ES 3.0 API
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glFramebufferTexture3DOES, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset))
+_COREGL_EXT_SYMBOL(void, glTexImage3DOES, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels))
+_COREGL_EXT_SYMBOL(void, glTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels))
+_COREGL_EXT_SYMBOL(void, glCopyTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height))
+_COREGL_EXT_SYMBOL(void, glCompressedTexImage3DOES, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data))
+_COREGL_EXT_SYMBOL(void, glCompressedTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data))
+_COREGL_EXT_SYMBOL(void, glFramebufferTexture3DOES, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset))
 
 _COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_OES_mapbuffer", 1.1, -1)
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glGetBufferPointervOES, (GLenum target, GLenum pname, GLvoid** params))
-_COREGL_EXT_SYMBOL(GL_TRUE, void *, glMapBufferOES, (GLenum target, GLenum access))
-_COREGL_EXT_SYMBOL(GL_TRUE, GLboolean, glUnmapBufferOES, (GLenum target))
+_COREGL_EXT_SYMBOL(void, glGetBufferPointervOES, (GLenum target, GLenum pname, GLvoid** params))
+_COREGL_EXT_SYMBOL(void *, glMapBufferOES, (GLenum target, GLenum access))
+_COREGL_EXT_SYMBOL(GLboolean, glUnmapBufferOES, (GLenum target))
 
 
-// ANGLE_framebuffer_blit
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glBlitFramebufferANGLE, (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter))
+_COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_ANGLE_framebuffer_blit", 1.1, -1)
+_COREGL_EXT_SYMBOL(void, glBlitFramebufferANGLE, (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter))
 
-// ANGLE_framebuffer_multisample
-_COREGL_EXT_SYMBOL(GL_TRUE, void, glRenderbufferStorageMultisampleANGLE, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height))
+_COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_ANGLE_framebuffer_multisample", 1.1, -1)
+_COREGL_EXT_SYMBOL(void, glRenderbufferStorageMultisampleANGLE, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height))
 
 
 
@@ -512,14 +512,6 @@ _COREGL_EXT_SYMBOL_FASTPATH_BLOCK(glExtGetProgramsQCOM)
 _COREGL_EXT_SYMBOL_FASTPATH_BLOCK(glExtIsProgramBinaryQCOM)
 _COREGL_EXT_SYMBOL_FASTPATH_BLOCK(glExtGetProgramBinarySourceQCOM)
 
-// ANGLE_framebuffer_blit
-//_COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_ANGLE_framebuffer_blit", 1.0, -1)
-_COREGL_EXT_SYMBOL_FASTPATH_BLOCK(glBlitFramebufferANGLE)
-
-// ANGLE_framebuffer_multisample
-//_COREGL_FASTPATH_SUPPORTED_EXTENSION("GL_ANGLE_framebuffer_multisample", 1.0, -1)
-_COREGL_EXT_SYMBOL_FASTPATH_BLOCK(glRenderbufferStorageMultisampleANGLE)
-
 // ES3 Invalid usages
 _COREGL_EXT_SYMBOL_FASTPATH_BLOCK(glBlitFramebuffer)
 

diff --git a/src/headers/sym_glx.h b/src/headers/sym_glx.h
index 1e5a157..a12015d 100644 (file)
--- a/src/headers/sym_glx.h
+++ b/src/headers/sym_glx.h
@@ -1,44 +1,44 @@
 // Defult use-case for exporting symbols
 #ifndef _COREGL_SYMBOL
 #define _COREGL_SYMBOL_NOT_DEFINED
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_COREGL_NAME_MANGLE(FUNC_NAME)) PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_COREGL_NAME_MANGLE(FUNC_NAME)) PARAM_LIST;
 #endif
 #ifndef _COREGL_EXT_SYMBOL
 #define _COREGL_EXT_SYMBOL_NOT_DEFINED
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)  _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)  _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 #endif
 
-_COREGL_SYMBOL(GL_FALSE, _eng_fn, glXGetProcAddress, (const char* procName))
+_COREGL_SYMBOL(_eng_fn, glXGetProcAddress, (const char* procName))
 
 // Standard GL(glX) functions
-_COREGL_SYMBOL(GL_FALSE, XVisualInfo*, glXChooseVisual, (Display* dpy, int screen, int* attribList))
-_COREGL_SYMBOL(GL_FALSE, GLXContext, glXCreateContext, (Display* dpy, XVisualInfo* vis, GLXContext shareList, Bool direct))
-_COREGL_SYMBOL(GL_FALSE, void, glXDestroyContext, (Display* dpy, GLXContext ctx))
-_COREGL_SYMBOL(GL_FALSE, GLXContext, glXGetCurrentContext, (void))
-_COREGL_SYMBOL(GL_FALSE, GLXDrawable, glXGetCurrentDrawable, (void))
-_COREGL_SYMBOL(GL_FALSE, Bool, glXMakeCurrent, (Display* dpy, GLXDrawable draw, GLXContext ctx))
-_COREGL_SYMBOL(GL_FALSE, void, glXSwapBuffers, (Display* dpy, GLXDrawable draw))
-_COREGL_SYMBOL(GL_FALSE, void, glXWaitX, (void))
-_COREGL_SYMBOL(GL_FALSE, void, glXWaitGL, (void))
-_COREGL_SYMBOL(GL_FALSE, Bool, glXQueryExtension, (Display* dpy, int* errorb, int* event))
-_COREGL_SYMBOL(GL_FALSE, const char*, glXQueryExtensionsString, (Display *dpy, int screen))
+_COREGL_SYMBOL(XVisualInfo*, glXChooseVisual, (Display* dpy, int screen, int* attribList))
+_COREGL_SYMBOL(GLXContext, glXCreateContext, (Display* dpy, XVisualInfo* vis, GLXContext shareList, Bool direct))
+_COREGL_SYMBOL(void, glXDestroyContext, (Display* dpy, GLXContext ctx))
+_COREGL_SYMBOL(GLXContext, glXGetCurrentContext, (void))
+_COREGL_SYMBOL(GLXDrawable, glXGetCurrentDrawable, (void))
+_COREGL_SYMBOL(Bool, glXMakeCurrent, (Display* dpy, GLXDrawable draw, GLXContext ctx))
+_COREGL_SYMBOL(void, glXSwapBuffers, (Display* dpy, GLXDrawable draw))
+_COREGL_SYMBOL(void, glXWaitX, (void))
+_COREGL_SYMBOL(void, glXWaitGL, (void))
+_COREGL_SYMBOL(Bool, glXQueryExtension, (Display* dpy, int* errorb, int* event))
+_COREGL_SYMBOL(const char*, glXQueryExtensionsString, (Display *dpy, int screen))
 
-_COREGL_SYMBOL(GL_FALSE, GLXFBConfig*, glXChooseFBConfig, (Display* dpy, int screen, const int* attribList, int* nitems))
-_COREGL_SYMBOL(GL_FALSE, GLXFBConfig*, glXGetFBConfigs, (Display* dpy, int screen, int* nelements))
-_COREGL_SYMBOL(GL_FALSE, int, glXGetFBConfigAttrib, (Display* dpy, GLXFBConfig config, int attribute, int* value))
-_COREGL_SYMBOL(GL_FALSE, XVisualInfo*, glXGetVisualFromFBConfig, (Display* dpy, GLXFBConfig config))
-_COREGL_SYMBOL(GL_FALSE, void, glXDestroyWindow, (Display* dpy, GLXWindow window))
-_COREGL_SYMBOL(GL_FALSE, Bool, glXMakeContextCurrent, (Display* dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx))
+_COREGL_SYMBOL(GLXFBConfig*, glXChooseFBConfig, (Display* dpy, int screen, const int* attribList, int* nitems))
+_COREGL_SYMBOL(GLXFBConfig*, glXGetFBConfigs, (Display* dpy, int screen, int* nelements))
+_COREGL_SYMBOL(int, glXGetFBConfigAttrib, (Display* dpy, GLXFBConfig config, int attribute, int* value))
+_COREGL_SYMBOL(XVisualInfo*, glXGetVisualFromFBConfig, (Display* dpy, GLXFBConfig config))
+_COREGL_SYMBOL(void, glXDestroyWindow, (Display* dpy, GLXWindow window))
+_COREGL_SYMBOL(Bool, glXMakeContextCurrent, (Display* dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx))
 
-_COREGL_SYMBOL(GL_FALSE, void, glXBindTexImage, (Display* dpy, GLXDrawable draw, int buffer, int* attribList))
-_COREGL_SYMBOL(GL_FALSE, void, glXReleaseTexImage, (Display* dpy, GLXDrawable draw, int buffer))
-_COREGL_SYMBOL(GL_FALSE, int, glXGetVideoSync, (unsigned int* count))
-_COREGL_SYMBOL(GL_FALSE, int, glXWaitVideoSync, (int divisor, int remainder, unsigned int* count))
-_COREGL_SYMBOL(GL_FALSE, XID, glXCreatePixmap, (Display* dpy, void* config, Pixmap pixmap, const int* attribList))
-_COREGL_SYMBOL(GL_FALSE, void, glXDestroyPixmap, (Display* dpy, XID pixmap))
-_COREGL_SYMBOL(GL_FALSE, void, glXQueryDrawable, (Display* dpy, XID draw, int attribute, unsigned int* value))
-_COREGL_SYMBOL(GL_FALSE, int, glXSwapIntervalSGI, (int interval))
-_COREGL_SYMBOL(GL_FALSE, void, glXSwapIntervalEXT, (Display* dpy, GLXDrawable draw, int interval))
+_COREGL_SYMBOL(void, glXBindTexImage, (Display* dpy, GLXDrawable draw, int buffer, int* attribList))
+_COREGL_SYMBOL(void, glXReleaseTexImage, (Display* dpy, GLXDrawable draw, int buffer))
+_COREGL_SYMBOL(int, glXGetVideoSync, (unsigned int* count))
+_COREGL_SYMBOL(int, glXWaitVideoSync, (int divisor, int remainder, unsigned int* count))
+_COREGL_SYMBOL(XID, glXCreatePixmap, (Display* dpy, void* config, Pixmap pixmap, const int* attribList))
+_COREGL_SYMBOL(void, glXDestroyPixmap, (Display* dpy, XID pixmap))
+_COREGL_SYMBOL(void, glXQueryDrawable, (Display* dpy, XID draw, int attribute, unsigned int* value))
+_COREGL_SYMBOL(int, glXSwapIntervalSGI, (int interval))
+_COREGL_SYMBOL(void, glXSwapIntervalEXT, (Display* dpy, GLXDrawable draw, int interval))
 
 #ifdef _COREGL_EXT_SYMBOL_NOT_DEFINED
 #undef _COREGL_EXT_SYMBOL_NOT_DEFINED

diff --git a/src/modules/appopt/coregl_appopt.c b/src/modules/appopt/coregl_appopt.c
index 2024b58..ae582f3 100644 (file)
--- a/src/modules/appopt/coregl_appopt.c
+++ b/src/modules/appopt/coregl_appopt.c
@@ -4,8 +4,8 @@
 #include <string.h>
 #include <sys/time.h>
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_orig_appopt_##FUNC_NAME) PARAM_LIST = NULL;
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_orig_appopt_##FUNC_NAME) PARAM_LIST = NULL;
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 # include "../../headers/sym.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL
@@ -54,8 +54,8 @@ appopt_apply_overrides()
 void
 appopt_apply_overrides_egl(int enable)
 {
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_appopt_, FUNC_NAME);
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_appopt_, FUNC_NAME);
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 # include "../../headers/sym_egl.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL
@@ -64,8 +64,8 @@ appopt_apply_overrides_egl(int enable)
 void
 appopt_apply_overrides_gl(int enable)
 {
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_appopt_, FUNC_NAME);
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_appopt_, FUNC_NAME);
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 # include "../../headers/sym_gl.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL

diff --git a/src/modules/appopt/coregl_appopt.h b/src/modules/appopt/coregl_appopt.h
index e8f7878..b9f3368 100644 (file)
--- a/src/modules/appopt/coregl_appopt.h
+++ b/src/modules/appopt/coregl_appopt.h
@@ -13,12 +13,12 @@
 #include "../../coregl_internal.h"
 #include "../../coregl_export.h"
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_orig_appopt_##FUNC_NAME) PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_orig_appopt_##FUNC_NAME) PARAM_LIST;
 # include "../../headers/sym.h"
 #undef _COREGL_SYMBOL
 
 // Symbol definition for appopt
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (appopt_##FUNC_NAME) PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (appopt_##FUNC_NAME) PARAM_LIST;
 # include "../../headers/sym.h"
 #undef _COREGL_SYMBOL
 

diff --git a/src/modules/fastpath/coregl_fastpath.c b/src/modules/fastpath/coregl_fastpath.c
index 7ee44a5..a7e81cd 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath.c
+++ b/src/modules/fastpath/coregl_fastpath.c
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_orig_fastpath_##FUNC_NAME) PARAM_LIST = NULL;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_orig_fastpath_##FUNC_NAME) PARAM_LIST = NULL;
 #include "../../headers/sym.h"
 #undef _COREGL_SYMBOL
 
@@ -254,7 +254,7 @@ fastpath_apply_overrides()
 void
 fastpath_apply_overrides_egl(int enable)
 {
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_fastpath_, FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_fastpath_, FUNC_NAME);
 # include "../../headers/sym_egl.h"
 #undef _COREGL_SYMBOL
 
@@ -278,7 +278,7 @@ fastpath_apply_overrides_egl(int enable)
 void
 fastpath_apply_overrides_gl(int enable)
 {
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_fastpath_, FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_fastpath_, FUNC_NAME);
 # include "../../headers/sym_gl.h"
 #undef _COREGL_SYMBOL
 
@@ -384,6 +384,8 @@ fastpath_apply_overrides_gl(int enable)
                COREGL_OVERRIDE(fastpath_, glVertexAttribPointer);
                COREGL_OVERRIDE(fastpath_, glViewport);
 
+               COREGL_OVERRIDE(fastpath_, glGetProgramBinaryOES);
+               COREGL_OVERRIDE(fastpath_, glProgramBinaryOES);
 
                COREGL_OVERRIDE(fastpath_, glUseProgramStagesEXT);
                COREGL_OVERRIDE(fastpath_, glActiveShaderProgramEXT);

diff --git a/src/modules/fastpath/coregl_fastpath.h b/src/modules/fastpath/coregl_fastpath.h
index f377b18..e686a51 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath.h
+++ b/src/modules/fastpath/coregl_fastpath.h
@@ -13,12 +13,12 @@
 #include "../../coregl_internal.h"
 #include "../../coregl_export.h"
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_orig_fastpath_##FUNC_NAME) PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_orig_fastpath_##FUNC_NAME) PARAM_LIST;
 # include "../../headers/sym.h"
 #undef _COREGL_SYMBOL
 
 // Symbol definition for fastpath
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (fastpath_##FUNC_NAME) PARAM_LIST;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (fastpath_##FUNC_NAME) PARAM_LIST;
 # include "../../headers/sym.h"
 #undef _COREGL_SYMBOL
 

diff --git a/src/modules/fastpath/coregl_fastpath_egl.c b/src/modules/fastpath/coregl_fastpath_egl.c
index 7815969..90ed838 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath_egl.c
+++ b/src/modules/fastpath/coregl_fastpath_egl.c
@@ -1377,7 +1377,7 @@ fastpath_eglGetProcAddress(const char* procname)
 
        _COREGL_FASTPATH_FUNC_BEGIN();
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) \
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) \
        if (strcmp(procname, #FUNC_NAME) == 0) \
        { \
                _eng_fn ret_orig = NULL; \

diff --git a/src/modules/fastpath/coregl_fastpath_gl.c b/src/modules/fastpath/coregl_fastpath_gl.c
index 902741c..16b7d0a 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath_gl.c
+++ b/src/modules/fastpath/coregl_fastpath_gl.c
@@ -1,6 +1,7 @@
 #include "coregl_fastpath.h"
 
 #include <stdlib.h>
+#include <string.h>
 #include <execinfo.h>
 
 #include <sys/types.h>
@@ -312,7 +313,7 @@ _valid_extension_string()
                                        {
                                                *estr = 0x00;
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 #define _COREGL_FASTPATH_SUPPORTED_EXTENSION(NAME, MINVER, MAXVER) \
                                                if (!strcmp(fstr, NAME) && (MINVER < 0 || GLver >= MINVER) && (MAXVER < 0 || GLver <= MAXVER)) \
                                                { \
@@ -4213,6 +4214,30 @@ finish:
 
 
 void
+fastpath_glGetProgramBinaryOES(GLuint program, GLsizei bufsize, GLsizei* length, GLenum* binaryFormat, void* binary)
+{
+       GLuint real_obj;
+
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
+
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_PROGRAM, program, &real_obj) != 1)
+       {
+               _set_gl_error(GL_INVALID_VALUE);
+               goto finish;
+       }
+
+       _orig_fastpath_glGetProgramBinaryOES(real_obj, bufsize, length, binaryFormat, binary);
+
+       goto finish;
+
+finish:
+       _COREGL_FASTPATH_FUNC_END();
+}
+
+
+void
 fastpath_glProgramBinary(GLuint program, GLenum binaryFormat, const void* binary, GLint length)
 {
        GLuint real_obj;
@@ -4237,6 +4262,30 @@ finish:
 
 
 void
+fastpath_glProgramBinaryOES(GLuint program, GLenum binaryFormat, const void* binary, GLint length)
+{
+       GLuint real_obj;
+
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
+
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_PROGRAM, program, &real_obj) != 1)
+       {
+               _set_gl_error(GL_INVALID_VALUE);
+               goto finish;
+       }
+
+       _orig_fastpath_glProgramBinaryOES(real_obj, binaryFormat, binary, length);
+
+       goto finish;
+
+finish:
+       _COREGL_FASTPATH_FUNC_END();
+}
+
+
+void
 fastpath_glReadBuffer(GLenum mode)
 {
        DEFINE_FASTPAH_GL_FUNC();

diff --git a/src/modules/tracepath/coregl_tracepath.c b/src/modules/tracepath/coregl_tracepath.c
index 00b5939..6bf541d 100755 (executable)
--- a/src/modules/tracepath/coregl_tracepath.c
+++ b/src/modules/tracepath/coregl_tracepath.c
@@ -9,7 +9,7 @@
 
 #include <dlfcn.h>
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_orig_tracepath_##FUNC_NAME) PARAM_LIST = NULL;
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_orig_tracepath_##FUNC_NAME) PARAM_LIST = NULL;
 #include "../../headers/sym.h"
 #undef _COREGL_SYMBOL
 
@@ -377,11 +377,11 @@ tracepath_apply_overrides()
 void
 tracepath_apply_overrides_egl(int enable)
 {
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME);
 # include "../../headers/sym_egl.h"
 #undef _COREGL_SYMBOL
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_OVERRIDE(tracepath_, FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_OVERRIDE(tracepath_, FUNC_NAME);
 # include "../../headers/sym_egl.h"
 #undef _COREGL_SYMBOL
 }
@@ -389,11 +389,11 @@ tracepath_apply_overrides_egl(int enable)
 void
 tracepath_apply_overrides_gl(int enable)
 {
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME);
 # include "../../headers/sym_gl.h"
 #undef _COREGL_SYMBOL
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_OVERRIDE(tracepath_, FUNC_NAME);
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_OVERRIDE(tracepath_, FUNC_NAME);
 # include "../../headers/sym_gl.h"
 #undef _COREGL_SYMBOL
 }

diff --git a/src/modules/tracepath/coregl_tracepath.h b/src/modules/tracepath/coregl_tracepath.h
index a649c58..e40a666 100644 (file)
--- a/src/modules/tracepath/coregl_tracepath.h
+++ b/src/modules/tracepath/coregl_tracepath.h
@@ -13,12 +13,12 @@
 #include "../../coregl_internal.h"\r
 #include "../../coregl_export.h"\r
 \r
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_orig_tracepath_##FUNC_NAME) PARAM_LIST;\r
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_orig_tracepath_##FUNC_NAME) PARAM_LIST;\r
 # include "../../headers/sym.h"\r
 #undef _COREGL_SYMBOL\r
 \r
 // Symbol definition for tracepath\r
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (tracepath_##FUNC_NAME) PARAM_LIST;\r
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (tracepath_##FUNC_NAME) PARAM_LIST;\r
 # include "../../headers/sym.h"\r
 #undef _COREGL_SYMBOL\r
 \r

diff --git a/src/modules/tracepath/coregl_tracepath_egl.c b/src/modules/tracepath/coregl_tracepath_egl.c
index a3124cd..6bf7743 100644 (file)
--- a/src/modules/tracepath/coregl_tracepath_egl.c
+++ b/src/modules/tracepath/coregl_tracepath_egl.c
@@ -935,7 +935,7 @@ tracepath_eglGetProcAddress(const char* procname)
 
        _COREGL_TRACEPATH_FUNC_BEGIN();
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) \
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) \
        if (strcmp(procname, #FUNC_NAME) == 0) \
        { \
                _eng_fn ret_orig = NULL; \

diff --git a/src/modules/tracepath/coregl_tracepath_gl.c b/src/modules/tracepath/coregl_tracepath_gl.c
index 3ff8aa5..0bd31d6 100644 (file)
--- a/src/modules/tracepath/coregl_tracepath_gl.c
+++ b/src/modules/tracepath/coregl_tracepath_gl.c
@@ -2368,6 +2368,18 @@ finish:
 }
 
 void
+tracepath_glTexImage3DOES(GLenum target, GLint level, GLint GLinternalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glTexImage3DOES(target, level, GLinternalFormat, width, height, depth, border, format, type, pixels);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+}
+
+void
 tracepath_glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
@@ -2380,6 +2392,18 @@ finish:
 }
 
 void
+tracepath_glTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glTexSubImage3DOES(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+}
+
+void
 tracepath_glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
@@ -2392,6 +2416,18 @@ finish:
 }
 
 void
+tracepath_glCopyTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glCopyTexSubImage3DOES(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+}
+
+void
 tracepath_glCompressedTexImage3D(GLenum target, GLint level, GLenum GLinternalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
@@ -2404,6 +2440,18 @@ finish:
 }
 
 void
+tracepath_glCompressedTexImage3DOES(GLenum target, GLint level, GLenum GLinternalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glCompressedTexImage3DOES(target, level, GLinternalformat, width, height, depth, border, imageSize, data);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+}
+
+void
 tracepath_glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
@@ -2416,6 +2464,18 @@ finish:
 }
 
 void
+tracepath_glCompressedTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glCompressedTexSubImage3DOES(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+}
+
+void
 tracepath_glGenQueries(GLsizei n, GLuint* ids)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
@@ -2717,6 +2777,97 @@ finish:
 }
 
 void
+tracepath_glRenderbufferStorageMultisampleEXT(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+#ifdef COREGL_TRACEPATH_TRACE_MEMUSE_INFO
+       if (trace_mem_flag == 1)
+       {
+               MY_MODULE_TSTATE *tstate = NULL;
+
+               GET_MY_TSTATE(tstate, get_current_thread_state());
+               AST(tstate != NULL);
+               if (tstate->ctx != NULL)
+               {
+                       int objidx = _COREGL_INT_INIT_VALUE;
+                       _orig_tracepath_glGetIntegerv(GL_RENDERBUFFER_BINDING, &objidx);
+                       AST(objidx != _COREGL_INT_INIT_VALUE);
+
+                       // Detect byte per pixel
+                       int bpp = 0;
+                       char formatment[80];
+                       switch (internalformat)
+                       {
+                               case GL_ALPHA: sprintf(formatment, "ALPHA"); bpp = 1; break;
+                               case GL_LUMINANCE: sprintf(formatment, "LUMINANCE"); bpp = 1; break;
+                               case GL_LUMINANCE_ALPHA: sprintf(formatment, "LUMINANCE_ALPHA"); bpp = 1; break;
+                               case GL_RGB: sprintf(formatment, "RGB"); bpp = 2; break;
+                               case GL_RGBA: sprintf(formatment, "RGBA"); bpp = 4; break;
+                               case 0x80E1: sprintf(formatment, "BGRA_EXT"); bpp = 4; break;
+                               case 0x84F9: sprintf(formatment, "DEPTH_STENCIL_OES"); bpp = 4; break;
+                               case GL_DEPTH_COMPONENT : sprintf(formatment, "DEPTH_COMPONENT"); bpp = 1; break;
+                               case 0x81A5: sprintf(formatment, "DEPTH_COMPONENT16_ARB"); bpp = 2; break;
+                               case 0x81A6: sprintf(formatment, "DEPTH_COMPONENT24_ARB"); bpp = 3; break;
+                               case 0x81A7: sprintf(formatment, "DEPTH_COMPONENT32_ARB"); bpp = 4; break;
+                               case 0x8D46 : sprintf(formatment, "STENCIL_INDEX1_OES"); bpp = 1; break;
+                               case 0x8D47 : sprintf(formatment, "STENCIL_INDEX4_OES"); bpp = 1; break;
+                               case 0x8D48 : sprintf(formatment, "STENCIL_INDEX8_OES"); bpp = 1; break;
+                               default: sprintf(formatment, "0x%X", internalformat); bpp = 0; break;
+                       }
+
+                       _add_glbuf_object(tstate->ctx->sostate->glbuf_rb, objidx, "Renderbuffer", width, height, bpp, formatment);
+               }
+       }
+#endif // COREGL_TRACEPATH_TRACE_MEMUSE_INFO
+#ifdef COREGL_TRACEPATH_TRACE_SURFACE_INFO
+       if (trace_surface_flag == 1)
+       {
+               MY_MODULE_TSTATE *tstate = NULL;
+
+               GET_MY_TSTATE(tstate, get_current_thread_state());
+               AST(tstate != NULL);
+               if (tstate->ctx != NULL)
+               {
+                       int objidx = _COREGL_INT_INIT_VALUE;
+                       _orig_tracepath_glGetIntegerv(GL_RENDERBUFFER_BINDING, &objidx);
+                       AST(objidx != _COREGL_INT_INIT_VALUE);
+
+                       {
+                               int channel = 0;
+                               switch (internalformat)
+                               {
+                                       case GL_ALPHA:
+                                       case GL_LUMINANCE:
+                                       case GL_DEPTH_COMPONENT :
+                                       case 0x81A5:
+                                       case 0x81A6:
+                                       case 0x81A7:
+                                       case 0x8D46 :
+                                       case 0x8D47 :
+                                       case 0x8D48 : channel = 1; break;
+                                       case GL_LUMINANCE_ALPHA:
+                                       case 0x84F9: channel = 2; break;
+                                       case GL_RGB: channel = 3; break;
+                                       case GL_RGBA:
+                                       case 0x80E1: channel = 4; break;
+                               }
+
+                               char name[256];
+                               sprintf(name, "FBORB_0x%X", objidx);
+                               tracepath_surface_trace_add(name, tstate->ctx->dpy, tstate->ctx->handle, tstate->surf_draw, -1, 0, objidx, width, height, channel, NULL);
+                       }
+               }
+       }
+#endif // COREGL_TRACEPATH_TRACE_SURFACE_INFO
+}
+
+void
 tracepath_glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
@@ -3620,6 +3771,18 @@ finish:
 }
 
 void
+tracepath_glGetProgramBinaryOES(GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glGetProgramBinaryOES(program, bufSize, length, binaryFormat, binary);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+}
+
+void
 tracepath_glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
@@ -3632,6 +3795,18 @@ finish:
 }
 
 void
+tracepath_glProgramBinaryOES(GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glProgramBinaryOES(program, binaryFormat, binary, length);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+}
+
+void
 tracepath_glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
@@ -3656,6 +3831,18 @@ finish:
 }
 
 void
+tracepath_glDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenum* attachments)
+{
+       _COREGL_TRACEPATH_FUNC_BEGIN();
+       _orig_tracepath_glDiscardFramebufferEXT(target, numAttachments, attachments);
+
+       goto finish;
+
+finish:
+       _COREGL_TRACEPATH_FUNC_END();
+}
+
+void
 tracepath_glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();

diff --git a/src/wraps/coregl_egl.c b/src/wraps/coregl_egl.c
index 751b936..18fda83 100755 (executable)
--- a/src/wraps/coregl_egl.c
+++ b/src/wraps/coregl_egl.c
@@ -6,19 +6,25 @@
 
 typedef void (*_eng_fn) (void);
 
-#define LOG_TAG "CoreGL_EGL"
-#include <dlog.h>
+///////////////////////////////////////
+// Disable dlog for debugging urgent issues //
+//#define LOG_TAG "CoreGL_EGL"
+//#include <dlog.h>
+#define LOGE(...) fprintf(stderr, __VA_ARGS__)
+#define LOGW(...) fprintf(stderr, __VA_ARGS__)
+#define LOGD(...) fprintf(stderr, __VA_ARGS__)
+///////////////////////////////////////
 
 #define COREGL_API           __attribute__((visibility("default")))
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_API extern RET_TYPE FUNC_NAME PARAM_LIST;
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_API extern RET_TYPE FUNC_NAME PARAM_LIST;
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 # include "../headers/sym_egl.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*ovr_##FUNC_NAME) PARAM_LIST = NULL;
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*ovr_##FUNC_NAME) PARAM_LIST = NULL;
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 # include "../headers/sym_egl.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL
@@ -39,7 +45,7 @@ coregl_glwrap_init()
                return 0;
        }
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) \
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) \
    ovr_##FUNC_NAME = (__typeof__(ovr_##FUNC_NAME))dlsym(lib_handle, "coregl_api_"#FUNC_NAME); \
        if (ovr_##FUNC_NAME == NULL) \
        { \
@@ -47,7 +53,7 @@ coregl_glwrap_init()
                LOGE("\E[40;31;1mInvalid library link! (Check linkage of libEGL -> libCOREGL)\E[0m\n"); \
        }
 
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 #include "../headers/sym_egl.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL

diff --git a/src/wraps/coregl_gl.c b/src/wraps/coregl_gl.c
index fdecec8..ba7eda9 100755 (executable)
--- a/src/wraps/coregl_gl.c
+++ b/src/wraps/coregl_gl.c
@@ -4,19 +4,25 @@
 # include <GLES/glplatform.h>
 # include "../headers/gl.h"
 
-#define LOG_TAG "CoreGL_GLES2"
-#include <dlog.h>
+///////////////////////////////////////
+// Disable dlog for debugging urgent issues //
+//#define LOG_TAG "CoreGL_GLES2"
+//#include <dlog.h>
+#define LOGE(...) fprintf(stderr, __VA_ARGS__)
+#define LOGW(...) fprintf(stderr, __VA_ARGS__)
+#define LOGD(...) fprintf(stderr, __VA_ARGS__)
+///////////////////////////////////////
 
 #define COREGL_API           __attribute__((visibility("default")))
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_API extern RET_TYPE FUNC_NAME PARAM_LIST;
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_API extern RET_TYPE FUNC_NAME PARAM_LIST;
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 # include "../headers/sym_gl.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*ovr_##FUNC_NAME) PARAM_LIST = NULL;
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*ovr_##FUNC_NAME) PARAM_LIST = NULL;
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 # include "../headers/sym_gl.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL
@@ -37,7 +43,7 @@ coregl_glwrap_init()
                return 0;
        }
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST) \
+#define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST) \
    ovr_##FUNC_NAME = (__typeof__(ovr_##FUNC_NAME))dlsym(lib_handle, "coregl_api_"#FUNC_NAME); \
        if (ovr_##FUNC_NAME == NULL) \
        { \
@@ -45,7 +51,7 @@ coregl_glwrap_init()
                LOGE("\E[40;31;1mInvalid library link! (Check linkage of libGLESv2 -> libCOREGL)\E[0m\n"); \
        }
 
-#define _COREGL_EXT_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)
+#define _COREGL_EXT_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)
 #include "../headers/sym_gl.h"
 #undef _COREGL_EXT_SYMBOL
 #undef _COREGL_SYMBOL