[IMPROVE] OpenGl c_probe prototypes

Added C aliases for C++ functions

Change-Id: Ib456faef2d66ac898806eedb034dd1ae89db39e0
Signed-off-by: Vitaliy Cherepanov <v.cherepanov@samsung.com>

6 files changed, 219 insertions, 228 deletions

diff --git a/Makefile b/Makefile
index c14d912..e22fb46 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,6 @@ TIZEN_SRCS =	$(COMMON_SRCS) $(CAPI_SRCS)\
 		./probe_graphics/da_gl_api_init.c			\
 		./probe_graphics/da_gles20_tizen.cpp			\
 		./probe_graphics/da_gles20_native.cpp			\
-		./probe_graphics/da_gles20_direct.cpp
 
 ASM_SRC = ./helper/da_call_original.S
 
diff --git a/include/da_gles20.h b/include/da_gles20.h
index 3de8475..e2aa299 100644
--- a/include/da_gles20.h
+++ b/include/da_gles20.h
@@ -115,7 +115,7 @@ extern EGLContext eglGetCurrentContext(void);
 #define INIT_LIB_ID_STR(LIB_ID, LIB_STR, KEYS)							\
 		if (lib_handle[LIB_ID] == ((void *) 0)) {		\
 			lib_handle[LIB_ID] = dlopen(LIB_STR, RTLD_LAZY | RTLD_GLOBAL); \
-			if (lib_handle[LIB_ID] == ((void *) 0)) {       \
+			if (lib_handle[LIB_ID] == ((void *) 0)) {	\
 				char perror_msg[128];			\
 				sprintf(perror_msg, "dlopen failed : [%s],%s", \
 					__FUNCTION__, LIB_STR);			\
@@ -173,6 +173,32 @@ extern EGLContext eglGetCurrentContext(void);
 	FLUSH_LOCAL_BUF();							\
 	POST_PACK_PROBEBLOCK_END()
 
+#define _ALIAS(NEW_FUNC, FUNCNAME, TYPE, ...)					\
+	TYPE NEW_FUNC(__VA_ARGS__) __attribute__ ((				\
+						   alias(FUNCSTR(FUNCNAME))	\
+						 ))
+
+#define FUNC_DECLAR(TYPE, FUNCNAME, ...)					\
+	/* alias for C function prototype */					\
+	extern _ALIAS(FUNCNAME, REAL_NAME(FUNCNAME), TYPE);			\
+	}									\
+	/* alias for C++ function prototype */					\
+	extern _ALIAS(FUNCNAME, REAL_NAME(FUNCNAME), TYPE, __VA_ARGS__);	\
+	extern "C"								\
+	{									\
+	TYPE REAL_NAME(FUNCNAME)(__VA_ARGS__)					\
+
+#define FUNC_DECLAR_NOARGS(TYPE, FUNCNAME)					\
+	/* alias for C function prototype */					\
+	extern _ALIAS(FUNCNAME, REAL_NAME(FUNCNAME), TYPE, int);		\
+	}									\
+	/* alias for C++ function prototype */					\
+	extern _ALIAS(FUNCNAME, REAL_NAME(FUNCNAME), TYPE);			\
+	extern "C"								\
+	{									\
+	TYPE REAL_NAME(FUNCNAME)()						\
+
+
 #define BEFORE_EVAS_GL(FUNCNAME)					\
 	DECLARE_VARIABLE_STANDARD_NORET;				\
 	GLenum error = GL_NO_ERROR;					\
@@ -184,8 +210,6 @@ extern EGLContext eglGetCurrentContext(void);
 		start_nsec = get_current_nsec();			\
 	GET_REAL_FUNCP_RTLD_DEFAULT(FUNCNAME, FUNCNAME##p)
 
-GLenum glGetError(void);
-void glGetIntegerv(GLenum pname, GLint * params);
 extern Evas_GL_API *__gl_api;
 extern Evas_GL_API *get_gl_api_fake_list(Evas_GL_API *api);
 #endif /* DA_GLES20_H_ */
diff --git a/probe_graphics/da_gles20.inc b/probe_graphics/da_gles20.inc
index 64dcd66..ac78a65 100644
--- a/probe_graphics/da_gles20.inc
+++ b/probe_graphics/da_gles20.inc
@@ -34,7 +34,7 @@
 #include "real_functions.h"
 #include "common_probe_init.h"
 
-static char contextValue[MAX_GL_CONTEXT_VALUE_SIZE];
+static char contextValue[MAX_GL_CONTEXT_VALUE_SIZE]; /* maybe it should not be gobal static variable */
 static __thread GLenum gl_error_external = GL_NO_ERROR;
 static __thread int is_gl_error_external = 1;
 
@@ -60,7 +60,34 @@ static void __ui_array_to_str(char *to, GLuint *arr ,int count, size_t bufsize)
 	}
 }
 
-GLenum REAL_NAME(glGetError)(void)
+
+static void __get_context_buf_data(GLenum target, char *buf, int buf_size)
+{
+       GLint n_buffer_size, n_buffer_usage_size;
+       int print_size;
+
+       if (buf == NULL)
+               return;
+
+       real_glGetBufferParameteriv(target, GL_BUFFER_SIZE,
+                                   &n_buffer_size);
+       real_glGetBufferParameteriv(target, GL_BUFFER_USAGE,
+                                   &n_buffer_usage_size);
+
+       print_size = snprintf(buf, buf_size, "%u,%u,%u",
+                             target, n_buffer_size, n_buffer_usage_size);
+
+       if (print_size >= buf_size) {
+               /* data was truncated. so data is invalid */
+               buf[0]='\0';
+       }
+}
+
+// ==================================================================
+// A 2
+// ==================================================================
+
+DECLARE_NOARGS(GLenum, glGetError)
 {
 	TYPEDEF(GLenum (*methodType)(void));
 	BEFORE(glGetError);
@@ -77,14 +104,10 @@ GLenum REAL_NAME(glGetError)(void)
 		AFTER_NO_PARAM('d', ret, APITYPE_CONTEXT, "");
 	}
 
+
 	return ret;
 }
-
-// ==================================================================
-// A 2
-// ==================================================================
-
-void REAL_NAME(glActiveTexture)(GLenum texture)
+DECLARE(void, glActiveTexture, GLenum texture)
 {
 	TYPEDEF(void (*methodType)(GLenum));
 	BEFORE(glActiveTexture);
@@ -94,7 +117,7 @@ void REAL_NAME(glActiveTexture)(GLenum texture)
 	      (uint64_t)(texture));
 }
 
-void REAL_NAME(glAttachShader)(GLuint program, GLuint shader)
+DECLARE(void, glAttachShader, GLuint program, GLuint shader)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLuint));
 	BEFORE(glAttachShader);
@@ -106,30 +129,8 @@ void REAL_NAME(glAttachShader)(GLuint program, GLuint shader)
 // ==================================================================
 // B 12
 // ==================================================================
-static void __get_context_buf_data(GLenum target, char *buf, int buf_size)
-{
-	GLint n_buffer_size, n_buffer_usage_size;
-	int print_size;
-
-	if (buf == NULL)
-		return;
-
-	real_glGetBufferParameteriv(target, GL_BUFFER_SIZE,
-				    &n_buffer_size);
-	real_glGetBufferParameteriv(target, GL_BUFFER_USAGE,
-				    &n_buffer_usage_size);
-
-	print_size = snprintf(buf, buf_size, "%u,%u,%u",
-			      target, n_buffer_size, n_buffer_usage_size);
 
-	if (print_size >= buf_size) {
-		/* data was truncated. so data is invalid */
-		buf[0]='\0';
-	}
-
-}
-
-void REAL_NAME(glBindAttribLocation)(GLuint program, GLuint index, const char *name)
+DECLARE(void, glBindAttribLocation, GLuint program, GLuint index, const char *name)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLuint, const char *));
 	BEFORE(glBindAttribLocation);
@@ -139,14 +140,13 @@ void REAL_NAME(glBindAttribLocation)(GLuint program, GLuint index, const char *n
 	      program, index, name);
 }
 
-void REAL_NAME(glBindBuffer)(GLenum target, GLuint buffer)
+DECLARE(void, glBindBuffer, GLenum target, GLuint buffer)
 {
 	char context_value[MAX_GL_CONTEXT_VALUE_SIZE] = {0,};
 
 	TYPEDEF(void (*methodType)(GLenum, GLuint));
 	BEFORE(glBindBuffer);
 	CALL_ORIG(glBindBuffer, target, buffer);
-
 	if (blockresult && buffer)
 		__get_context_buf_data(target, &context_value[0],
 				       sizeof(context_value));
@@ -156,7 +156,7 @@ void REAL_NAME(glBindBuffer)(GLenum target, GLuint buffer)
 	      (uint64_t)(target), buffer);
 }
 
-void REAL_NAME(glBindFramebuffer)(GLenum target, GLuint framebuffer)
+DECLARE(void, glBindFramebuffer, GLenum target, GLuint framebuffer)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLuint));
 	BEFORE(glBindFramebuffer);
@@ -166,7 +166,7 @@ void REAL_NAME(glBindFramebuffer)(GLenum target, GLuint framebuffer)
 	      (uint64_t)(target), framebuffer);
 }
 
-void REAL_NAME(glBindRenderbuffer)(GLenum target, GLuint renderbuffer)
+DECLARE(void, glBindRenderbuffer, GLenum target, GLuint renderbuffer)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLuint));
 	BEFORE(glBindRenderbuffer);
@@ -176,7 +176,7 @@ void REAL_NAME(glBindRenderbuffer)(GLenum target, GLuint renderbuffer)
 	      (uint64_t)(target), renderbuffer);
 }
 
-void REAL_NAME(glBindTexture)(GLenum target, GLuint texture)
+DECLARE(void, glBindTexture, GLenum target, GLuint texture)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLuint));
 	BEFORE(glBindTexture);
@@ -186,7 +186,7 @@ void REAL_NAME(glBindTexture)(GLenum target, GLuint texture)
 	      (uint64_t)(target), texture);
 }
 
-void REAL_NAME(glBlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+DECLARE(void, glBlendColor, GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 {
 	TYPEDEF(void (*methodType)(GLclampf, GLclampf, GLclampf, GLclampf));
 	BEFORE(glBlendColor);
@@ -196,7 +196,7 @@ void REAL_NAME(glBlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclam
 	      red, green, blue, alpha);
 }
 
-void REAL_NAME(glBlendEquation)(GLenum mode)
+DECLARE(void, glBlendEquation, GLenum mode)
 {
 	TYPEDEF(void (*methodType)(GLenum));
 	BEFORE(glBlendEquation);
@@ -206,7 +206,7 @@ void REAL_NAME(glBlendEquation)(GLenum mode)
 	      (uint64_t)(mode));
 }
 
-void REAL_NAME(glBlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha)
+DECLARE(void, glBlendEquationSeparate, GLenum modeRGB, GLenum modeAlpha)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum));
 	BEFORE(glBlendEquationSeparate);
@@ -216,7 +216,7 @@ void REAL_NAME(glBlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha)
 	      (uint64_t)(modeRGB), (uint64_t)(modeAlpha));
 }
 
-void REAL_NAME(glBlendFunc)(GLenum sfactor, GLenum dfactor)
+DECLARE(void, glBlendFunc, GLenum sfactor, GLenum dfactor)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum));
 	BEFORE(glBlendFunc);
@@ -226,7 +226,7 @@ void REAL_NAME(glBlendFunc)(GLenum sfactor, GLenum dfactor)
 	      (uint64_t)(sfactor), (uint64_t)(dfactor));
 }
 
-void REAL_NAME(glBlendFuncSeparate)(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
+DECLARE(void, glBlendFuncSeparate, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
 			 GLenum dstAlpha)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLenum, GLenum));
@@ -238,7 +238,7 @@ void REAL_NAME(glBlendFuncSeparate)(GLenum srcRGB, GLenum dstRGB, GLenum srcAlph
 	      (uint64_t)(srcAlpha), (uint64_t)(dstAlpha));
 }
 
-void REAL_NAME(glBufferData)(GLenum target, GLsizeiptr size, const GLvoid * data,
+DECLARE(void, glBufferData, GLenum target, GLsizeiptr size, const GLvoid * data,
 		  GLenum usage)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLsizeiptr, const GLvoid *, GLenum));
@@ -255,7 +255,7 @@ void REAL_NAME(glBufferData)(GLenum target, GLsizeiptr size, const GLvoid * data
 	      voidp_to_uint64(data), (uint64_t)(usage));
 }
 
-void REAL_NAME(glBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size,
+DECLARE(void, glBufferSubData, GLenum target, GLintptr offset, GLsizeiptr size,
 		     const GLvoid * data)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLintptr, GLsizeiptr,
@@ -277,7 +277,7 @@ void REAL_NAME(glBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size,
 // C 14
 // ==================================================================
 
-GLenum REAL_NAME(glCheckFramebufferStatus)(GLenum target)
+DECLARE(GLenum, glCheckFramebufferStatus, GLenum target)
 {
 	TYPEDEF(GLenum (*methodType)(GLenum));
 	BEFORE(glCheckFramebufferStatus);
@@ -289,7 +289,7 @@ GLenum REAL_NAME(glCheckFramebufferStatus)(GLenum target)
 	return ret;
 }
 
-void REAL_NAME(glClear)(GLbitfield mask)
+DECLARE(void, glClear, GLbitfield mask)
 {
 	TYPEDEF(void (*methodType)(GLbitfield));
 	BEFORE(glClear);
@@ -299,7 +299,7 @@ void REAL_NAME(glClear)(GLbitfield mask)
 	      (uint64_t)(mask));
 }
 
-void REAL_NAME(glClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+DECLARE(void, glClearColor, GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 {
 	TYPEDEF(void (*methodType)(GLclampf, GLclampf, GLclampf, GLclampf));
 	BEFORE(glClearColor);
@@ -309,7 +309,7 @@ void REAL_NAME(glClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclam
 	      red, green, blue, alpha);
 }
 
-void REAL_NAME(glClearDepthf)(GLclampf depth)
+DECLARE(void, glClearDepthf, GLclampf depth)
 {
 	TYPEDEF(void (*methodType)(GLclampf));
 	BEFORE(glClearDepthf);
@@ -318,7 +318,7 @@ void REAL_NAME(glClearDepthf)(GLclampf depth)
 	AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "f", depth);
 }
 
-void REAL_NAME(glClearStencil)(GLint s)
+DECLARE(void, glClearStencil, GLint s)
 {
 	TYPEDEF(void (*methodType)(GLint));
 	BEFORE(glClearStencil);
@@ -327,7 +327,7 @@ void REAL_NAME(glClearStencil)(GLint s)
 	AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", s);
 }
 
-void REAL_NAME(glColorMask)(GLboolean red, GLboolean green, GLboolean blue,
+DECLARE(void, glColorMask, GLboolean red, GLboolean green, GLboolean blue,
 		 GLboolean alpha)
 {
 	TYPEDEF(void (*methodType)(GLboolean, GLboolean, GLboolean, GLboolean));
@@ -338,7 +338,7 @@ void REAL_NAME(glColorMask)(GLboolean red, GLboolean green, GLboolean blue,
 	      red, green, blue, alpha);
 }
 
-void REAL_NAME(glCompileShader)(GLuint shader)
+DECLARE(void, glCompileShader, GLuint shader)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glCompileShader);
@@ -348,7 +348,7 @@ void REAL_NAME(glCompileShader)(GLuint shader)
 	      (uint64_t)(shader));
 }
 
-void REAL_NAME(glCompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat,
+DECLARE(void, glCompressedTexImage2D, GLenum target, GLint level, GLenum internalformat,
 			    GLsizei width, GLsizei height, GLint border,
 			    GLsizei imageSize, const GLvoid * data)
 {
@@ -364,7 +364,7 @@ void REAL_NAME(glCompressedTexImage2D)(GLenum target, GLint level, GLenum intern
 	      voidp_to_uint64(data));
 }
 
-void REAL_NAME(glCompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset,
+DECLARE(void, glCompressedTexSubImage2D, GLenum target, GLint level, GLint xoffset,
 			       GLint yoffset, GLsizei width, GLsizei height,
 			       GLenum format, GLsizei imageSize,
 			       const GLvoid * data)
@@ -380,7 +380,7 @@ void REAL_NAME(glCompressedTexSubImage2D)(GLenum target, GLint level, GLint xoff
 	      (uint64_t)(format), imageSize, voidp_to_uint64(data));
 }
 
-void REAL_NAME(glCopyTexImage2D)(GLenum target, GLint level, GLenum internalformat,
+DECLARE(void, glCopyTexImage2D, GLenum target, GLint level, GLenum internalformat,
 		      GLint x, GLint y, GLsizei width, GLsizei height,
 		      GLint border)
 {
@@ -395,7 +395,7 @@ void REAL_NAME(glCopyTexImage2D)(GLenum target, GLint level, GLenum internalform
 	      (uint64_t)(internalformat), x, y, width, height, border);
 }
 
-void REAL_NAME(glCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset,
+DECLARE(void, glCopyTexSubImage2D, GLenum target, GLint level, GLint xoffset,
 			 GLint yoffset, GLint x, GLint y, GLsizei width,
 			 GLsizei height)
 {
@@ -410,7 +410,7 @@ void REAL_NAME(glCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset,
 	      height);
 }
 
-GLuint REAL_NAME(glCreateProgram)(void)
+DECLARE_NOARGS(GLuint, glCreateProgram)
 {
 	TYPEDEF(GLuint (*methodType)(void));
 	BEFORE(glCreateProgram);
@@ -421,7 +421,7 @@ GLuint REAL_NAME(glCreateProgram)(void)
 	return ret;
 }
 
-GLuint REAL_NAME(glCreateShader)(GLenum shaderType)
+DECLARE(GLuint, glCreateShader, GLenum shaderType)
 {
 	TYPEDEF(GLuint (*methodType)(GLenum));
 	BEFORE(glCreateShader);
@@ -432,7 +432,7 @@ GLuint REAL_NAME(glCreateShader)(GLenum shaderType)
 	return ret;
 }
 
-void REAL_NAME(glCullFace)(GLenum mode)
+DECLARE(void, glCullFace, GLenum mode)
 {
 	TYPEDEF(void (*methodType)(GLenum));
 	BEFORE(glCullFace);
@@ -446,7 +446,7 @@ void REAL_NAME(glCullFace)(GLenum mode)
 // D 14
 // ==================================================================
 
-void REAL_NAME(glDeleteBuffers)(GLsizei n, const GLuint * buffers)
+DECLARE(void, glDeleteBuffers, GLsizei n, const GLuint * buffers)
 {
 	TYPEDEF(void (*methodType)(GLsizei, const GLuint *));
 	BEFORE(glDeleteBuffers);
@@ -458,7 +458,7 @@ void REAL_NAME(glDeleteBuffers)(GLsizei n, const GLuint * buffers)
 	      n, voidp_to_uint64(buffers));
 }
 
-void REAL_NAME(glDeleteFramebuffers)(GLsizei n, const GLuint * framebuffers)
+DECLARE(void, glDeleteFramebuffers, GLsizei n, const GLuint * framebuffers)
 {
 	TYPEDEF(void (*methodType)(GLsizei, const GLuint *));
 	BEFORE(glDeleteFramebuffers);
@@ -468,7 +468,7 @@ void REAL_NAME(glDeleteFramebuffers)(GLsizei n, const GLuint * framebuffers)
 	      n, voidp_to_uint64(framebuffers));
 }
 
-void REAL_NAME(glDeleteProgram)(GLuint program)
+DECLARE(void, glDeleteProgram, GLuint program)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glDeleteProgram);
@@ -477,7 +477,7 @@ void REAL_NAME(glDeleteProgram)(GLuint program)
 	AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", program);
 }
 
-void REAL_NAME(glDeleteRenderbuffers)(GLsizei n, const GLuint * renderbuffers)
+DECLARE(void, glDeleteRenderbuffers, GLsizei n, const GLuint * renderbuffers)
 {
 	TYPEDEF(void (*methodType)(GLsizei, const GLuint *));
 	BEFORE(glDeleteRenderbuffers);
@@ -487,7 +487,7 @@ void REAL_NAME(glDeleteRenderbuffers)(GLsizei n, const GLuint * renderbuffers)
 	      n, voidp_to_uint64(renderbuffers));
 }
 
-void REAL_NAME(glDeleteShader)(GLuint shader)
+DECLARE(void, glDeleteShader, GLuint shader)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glDeleteShader);
@@ -496,7 +496,7 @@ void REAL_NAME(glDeleteShader)(GLuint shader)
 	AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", shader);
 }
 
-void REAL_NAME(glDeleteTextures)(GLsizei n, const GLuint *textures)
+DECLARE(void, glDeleteTextures, GLsizei n, const GLuint *textures)
 {
 	TYPEDEF(void (*methodType)(GLsizei, const GLuint *));
 	char buf[128] = "";
@@ -511,7 +511,7 @@ void REAL_NAME(glDeleteTextures)(GLsizei n, const GLuint *textures)
 	      n, voidp_to_uint64(textures));
 }
 
-void REAL_NAME(glDepthFunc)(GLenum func)
+DECLARE(void, glDepthFunc, GLenum func)
 {
 	TYPEDEF(void (*methodType)(GLenum));
 	BEFORE(glDepthFunc);
@@ -521,7 +521,7 @@ void REAL_NAME(glDepthFunc)(GLenum func)
 	      (uint64_t)(func));
 }
 
-void REAL_NAME(glDepthMask)(GLboolean flag)
+DECLARE(void, glDepthMask, GLboolean flag)
 {
 	TYPEDEF(void (*methodType)(GLboolean));
 	BEFORE(glDepthMask);
@@ -531,7 +531,7 @@ void REAL_NAME(glDepthMask)(GLboolean flag)
 	      (uint64_t)(flag));
 }
 
-void REAL_NAME(glDepthRangef)(GLclampf nearVal, GLclampf farVal)
+DECLARE(void, glDepthRangef, GLclampf nearVal, GLclampf farVal)
 {
 	TYPEDEF(void (*methodType)(GLclampf, GLclampf));
 	BEFORE(glDepthRangef);
@@ -541,7 +541,7 @@ void REAL_NAME(glDepthRangef)(GLclampf nearVal, GLclampf farVal)
 	      nearVal, farVal);
 }
 
-void REAL_NAME(glDetachShader)(GLuint program, GLuint shader)
+DECLARE(void, glDetachShader, GLuint program, GLuint shader)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLuint));
 	BEFORE(glDetachShader);
@@ -551,7 +551,7 @@ void REAL_NAME(glDetachShader)(GLuint program, GLuint shader)
 	      program, shader);
 }
 
-void REAL_NAME(glDisable)(GLenum cap)
+DECLARE(void, glDisable, GLenum cap)
 {
 	TYPEDEF(void (*methodType)(GLenum));
 	BEFORE(glDisable);
@@ -560,7 +560,7 @@ void REAL_NAME(glDisable)(GLenum cap)
 	AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
 }
 
-void REAL_NAME(glDisableVertexAttribArray)(GLuint index)
+DECLARE(void, glDisableVertexAttribArray, GLuint index)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glDisableVertexAttribArray);
@@ -569,7 +569,7 @@ void REAL_NAME(glDisableVertexAttribArray)(GLuint index)
 	AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", index);
 }
 
-void REAL_NAME(glDrawArrays)(GLenum mode, GLint first, GLsizei count)
+DECLARE(void, glDrawArrays, GLenum mode, GLint first, GLsizei count)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLint, GLsizei));
 	BEFORE(glDrawArrays);
@@ -579,7 +579,7 @@ void REAL_NAME(glDrawArrays)(GLenum mode, GLint first, GLsizei count)
 	      (uint64_t)(mode), first, count);
 }
 
-void REAL_NAME(glDrawElements)(GLenum mode, GLsizei count, GLenum type,
+DECLARE(void, glDrawElements, GLenum mode, GLsizei count, GLenum type,
 		const GLvoid *indices)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLsizei, GLenum, const GLvoid *));
@@ -594,7 +594,7 @@ void REAL_NAME(glDrawElements)(GLenum mode, GLsizei count, GLenum type,
 // E 2
 // ==================================================================
 
-void REAL_NAME(glEnable)(GLenum cap)
+DECLARE(void, glEnable, GLenum cap)
 {
 	TYPEDEF(void (*methodType)(GLenum));
 	BEFORE(glEnable);
@@ -603,7 +603,7 @@ void REAL_NAME(glEnable)(GLenum cap)
 	AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
 }
 
-void REAL_NAME(glEnableVertexAttribArray)(GLuint index)
+DECLARE(void, glEnableVertexAttribArray, GLuint index)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glEnableVertexAttribArray);
@@ -616,7 +616,7 @@ void REAL_NAME(glEnableVertexAttribArray)(GLuint index)
 // F 5
 // ==================================================================
 
-void REAL_NAME(glFinish)(void)
+DECLARE_NOARGS(void, glFinish)
 {
 	TYPEDEF(void (*methodType)(void));
 	BEFORE(glFinish);
@@ -625,7 +625,7 @@ void REAL_NAME(glFinish)(void)
 	AFTER_NO_PARAM('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "");
 }
 
-void REAL_NAME(glFlush)(void)
+DECLARE_NOARGS(void, glFlush)
 {
 	TYPEDEF(void (*methodType)(void));
 	BEFORE(glFlush);
@@ -634,7 +634,7 @@ void REAL_NAME(glFlush)(void)
 	AFTER_NO_PARAM('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "");
 }
 
-void REAL_NAME(glFramebufferRenderbuffer)(GLenum target, GLenum attachment,
+DECLARE(void, glFramebufferRenderbuffer, GLenum target, GLenum attachment,
 			       GLenum renderbuffertarget, GLuint renderbuffer)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLenum, GLuint));
@@ -647,7 +647,7 @@ void REAL_NAME(glFramebufferRenderbuffer)(GLenum target, GLenum attachment,
 	      (uint64_t)(renderbuffertarget), renderbuffer);
 }
 
-void REAL_NAME(glFramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget,
+DECLARE(void, glFramebufferTexture2D, GLenum target, GLenum attachment, GLenum textarget,
 			    GLuint texture, GLint level)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLenum, GLuint, GLint));
@@ -660,7 +660,7 @@ void REAL_NAME(glFramebufferTexture2D)(GLenum target, GLenum attachment, GLenum
 	      (uint64_t)(textarget), texture, level);
 }
 
-void REAL_NAME(glFrontFace)(GLenum mode)
+DECLARE(void, glFrontFace, GLenum mode)
 {
 	TYPEDEF(void (*methodType)(GLenum));
 	BEFORE(glFrontFace);
@@ -674,7 +674,7 @@ void REAL_NAME(glFrontFace)(GLenum mode)
 // G 31
 // ==================================================================
 
-void REAL_NAME(glGenBuffers)(GLsizei n, GLuint * buffers)
+DECLARE(void, glGenBuffers, GLsizei n, GLuint * buffers)
 {
 	TYPEDEF(void (*methodType)(GLsizei, GLuint *));
 	char buf[128] = "";
@@ -689,7 +689,7 @@ void REAL_NAME(glGenBuffers)(GLsizei n, GLuint * buffers)
 	      n, voidp_to_uint64(buffers));
 }
 
-void REAL_NAME(glGenFramebuffers)(GLsizei n, GLuint * framebuffers)
+DECLARE(void, glGenFramebuffers, GLsizei n, GLuint * framebuffers)
 {
 	TYPEDEF(void (*methodType)(GLsizei, GLuint *));
 	BEFORE(glGenFramebuffers);
@@ -699,7 +699,7 @@ void REAL_NAME(glGenFramebuffers)(GLsizei n, GLuint * framebuffers)
 	      n, voidp_to_uint64(framebuffers));
 }
 
-void REAL_NAME(glGenRenderbuffers)(GLsizei n, GLuint * renderbuffers)
+DECLARE(void, glGenRenderbuffers, GLsizei n, GLuint * renderbuffers)
 {
 	TYPEDEF(void (*methodType)(GLsizei, GLuint *));
 	BEFORE(glGenRenderbuffers);
@@ -709,7 +709,7 @@ void REAL_NAME(glGenRenderbuffers)(GLsizei n, GLuint * renderbuffers)
 	      n, voidp_to_uint64(renderbuffers));
 }
 
-void REAL_NAME(glGenTextures)(GLsizei n, GLuint * textures)
+DECLARE(void, glGenTextures, GLsizei n, GLuint * textures)
 {
 	TYPEDEF(void (*methodType)(GLsizei, GLuint *));
 	char buf[128] = "";
@@ -724,7 +724,7 @@ void REAL_NAME(glGenTextures)(GLsizei n, GLuint * textures)
 	      n, voidp_to_uint64(textures));
 }
 
-void REAL_NAME(glGenerateMipmap)(GLenum target)
+DECLARE(void, glGenerateMipmap, GLenum target)
 {
 	TYPEDEF(void (*methodType)(GLenum));
 	BEFORE(glGenerateMipmap);
@@ -735,7 +735,7 @@ void REAL_NAME(glGenerateMipmap)(GLenum target)
 }
 
 //lsh_get
-void REAL_NAME(glGetBooleanv)(GLenum pname, GLboolean * params)
+DECLARE(void, glGetBooleanv, GLenum pname, GLboolean * params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLboolean *));
 	BEFORE(glGetBooleanv);
@@ -746,7 +746,7 @@ void REAL_NAME(glGetBooleanv)(GLenum pname, GLboolean * params)
 }
 
 //lsh_get
-void REAL_NAME(glGetFloatv)(GLenum pname, GLfloat * params)
+DECLARE(void, glGetFloatv, GLenum pname, GLfloat * params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLfloat *));
 	BEFORE(glGetFloatv);
@@ -757,7 +757,7 @@ void REAL_NAME(glGetFloatv)(GLenum pname, GLfloat * params)
 }
 
 //lsh_get
-void REAL_NAME(glGetIntegerv)(GLenum pname, GLint * params)
+DECLARE(void, glGetIntegerv, GLenum pname, GLint * params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLint *));
 	BEFORE(glGetIntegerv);
@@ -768,7 +768,7 @@ void REAL_NAME(glGetIntegerv)(GLenum pname, GLint * params)
 }
 
 //lsh_get
-void REAL_NAME(glGetActiveAttrib)(GLuint program, GLuint index, GLsizei bufSize,
+DECLARE(void, glGetActiveAttrib, GLuint program, GLuint index, GLsizei bufSize,
 		       GLsizei *length, GLint *size, GLenum *type, char *name)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLuint, GLsizei, GLsizei *, GLint *,
@@ -782,7 +782,7 @@ void REAL_NAME(glGetActiveAttrib)(GLuint program, GLuint index, GLsizei bufSize,
 }
 
 //lsh_get
-void REAL_NAME(glGetActiveUniform)(GLuint program, GLuint index, GLsizei bufSize,
+DECLARE(void, glGetActiveUniform, GLuint program, GLuint index, GLsizei bufSize,
 			GLsizei *length, GLint *size, GLenum *type, char *name)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLuint, GLsizei, GLsizei *, GLint *,
@@ -796,7 +796,7 @@ void REAL_NAME(glGetActiveUniform)(GLuint program, GLuint index, GLsizei bufSize
 }
 
 //lsh_get
-void REAL_NAME(glGetAttachedShaders)(GLuint program, GLsizei maxCount, GLsizei *count,
+DECLARE(void, glGetAttachedShaders, GLuint program, GLsizei maxCount, GLsizei *count,
 			  GLuint *shaders)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLsizei, GLsizei *, GLuint *));
@@ -808,7 +808,7 @@ void REAL_NAME(glGetAttachedShaders)(GLuint program, GLsizei maxCount, GLsizei *
 }
 
 //lsh_get
-int REAL_NAME(glGetAttribLocation)(GLuint program, const char *name)
+DECLARE(int ,glGetAttribLocation, GLuint program, const char *name)
 {
 	TYPEDEF(int (*methodType)(GLuint, const char*));
 	BEFORE(glGetAttribLocation);
@@ -820,7 +820,7 @@ int REAL_NAME(glGetAttribLocation)(GLuint program, const char *name)
 }
 
 //lsh_get
-void REAL_NAME(glGetBufferParameteriv)(GLenum target, GLenum value, GLint * data)
+DECLARE(void, glGetBufferParameteriv, GLenum target, GLenum value, GLint * data)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLint *));
 	BEFORE(glGetBufferParameteriv);
@@ -831,7 +831,7 @@ void REAL_NAME(glGetBufferParameteriv)(GLenum target, GLenum value, GLint * data
 }
 
 //lsh_get
-void REAL_NAME(glGetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment,
+DECLARE(void, glGetFramebufferAttachmentParameteriv, GLenum target, GLenum attachment,
 					   GLenum pname, GLint * params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLenum, GLint *));
@@ -844,7 +844,7 @@ void REAL_NAME(glGetFramebufferAttachmentParameteriv)(GLenum target, GLenum atta
 }
 
 //lsh_get
-void REAL_NAME(glGetProgramInfoLog)(GLuint program, GLsizei maxLength, GLsizei *length,
+DECLARE(void, glGetProgramInfoLog, GLuint program, GLsizei maxLength, GLsizei *length,
 			 char *infoLog)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLsizei, GLsizei *, char *));
@@ -856,7 +856,7 @@ void REAL_NAME(glGetProgramInfoLog)(GLuint program, GLsizei maxLength, GLsizei *
 }
 
 //lsh_get
-void REAL_NAME(glGetProgramiv)(GLuint program, GLenum pname, GLint *params)
+DECLARE(void, glGetProgramiv, GLuint program, GLenum pname, GLint *params)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLenum, GLint *));
 	BEFORE(glGetProgramiv);
@@ -867,7 +867,7 @@ void REAL_NAME(glGetProgramiv)(GLuint program, GLenum pname, GLint *params)
 }
 
 //lsh_get
-void REAL_NAME(glGetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint *params)
+DECLARE(void, glGetRenderbufferParameteriv, GLenum target, GLenum pname, GLint *params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLint *));
 	BEFORE(glGetRenderbufferParameteriv);
@@ -878,7 +878,7 @@ void REAL_NAME(glGetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint
 }
 
 //lsh_get
-void REAL_NAME(glGetShaderInfoLog)(GLuint shader, GLsizei maxLength, GLsizei *length,
+DECLARE(void, glGetShaderInfoLog, GLuint shader, GLsizei maxLength, GLsizei *length,
 			char *infoLog)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLsizei, GLsizei *, char *));
@@ -890,7 +890,7 @@ void REAL_NAME(glGetShaderInfoLog)(GLuint shader, GLsizei maxLength, GLsizei *le
 }
 
 //lsh_get
-void REAL_NAME(glGetShaderPrecisionFormat)(GLenum shaderType, GLenum precisionType,
+DECLARE(void, glGetShaderPrecisionFormat, GLenum shaderType, GLenum precisionType,
 				GLint *range, GLint *precision)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLint *, GLint *));
@@ -903,7 +903,7 @@ void REAL_NAME(glGetShaderPrecisionFormat)(GLenum shaderType, GLenum precisionTy
 }
 
 //lsh_get
-void REAL_NAME(glGetShaderSource)(GLuint shader, GLsizei bufSize, GLsizei *length,
+DECLARE(void, glGetShaderSource, GLuint shader, GLsizei bufSize, GLsizei *length,
 		       char *source)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLsizei, GLsizei *, char *));
@@ -915,7 +915,7 @@ void REAL_NAME(glGetShaderSource)(GLuint shader, GLsizei bufSize, GLsizei *lengt
 }
 
 //lsh_get
-void REAL_NAME(glGetShaderiv)(GLuint shader, GLenum pname, GLint *params)
+DECLARE(void, glGetShaderiv, GLuint shader, GLenum pname, GLint *params)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLenum, GLint *));
 	BEFORE(glGetShaderiv);
@@ -925,7 +925,7 @@ void REAL_NAME(glGetShaderiv)(GLuint shader, GLenum pname, GLint *params)
 	      shader, (uint64_t)(pname));
 }
 
-const GLubyte *REAL_NAME(glGetString)(GLenum name)
+DECLARE(const GLubyte *, glGetString, GLenum name)
 {
 	TYPEDEF(const GLubyte *(*methodType)(GLenum));
 	BEFORE(glGetString);
@@ -935,9 +935,8 @@ const GLubyte *REAL_NAME(glGetString)(GLenum name)
 
 	return ret;
 }
-
 //lsh_get
-void REAL_NAME(glGetTexParameterfv)(GLenum target, GLenum pname, GLfloat * params)
+DECLARE(void, glGetTexParameterfv, GLenum target, GLenum pname, GLfloat * params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLfloat *));
 	BEFORE(glGetTexParameterfv);
@@ -948,7 +947,7 @@ void REAL_NAME(glGetTexParameterfv)(GLenum target, GLenum pname, GLfloat * param
 }
 
 //lsh_get
-void REAL_NAME(glGetTexParameteriv)(GLenum target, GLenum pname, GLint * params)
+DECLARE(void, glGetTexParameteriv, GLenum target, GLenum pname, GLint * params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLint *));
 	BEFORE(glGetTexParameteriv);
@@ -959,7 +958,7 @@ void REAL_NAME(glGetTexParameteriv)(GLenum target, GLenum pname, GLint * params)
 }
 
 //lsh_get
-void REAL_NAME(glGetUniformfv)(GLuint program, GLint location, GLfloat *params)
+DECLARE(void, glGetUniformfv, GLuint program, GLint location, GLfloat *params)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLuint, GLfloat *));
 	BEFORE(glGetUniformfv);
@@ -970,7 +969,7 @@ void REAL_NAME(glGetUniformfv)(GLuint program, GLint location, GLfloat *params)
 }
 
 //lsh_get
-void REAL_NAME(glGetUniformiv)(GLuint program, GLint location, GLint *params)
+DECLARE(void, glGetUniformiv, GLuint program, GLint location, GLint *params)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLuint, GLint *));
 	BEFORE(glGetUniformiv);
@@ -981,7 +980,7 @@ void REAL_NAME(glGetUniformiv)(GLuint program, GLint location, GLint *params)
 }
 
 //lsh_get
-GLint REAL_NAME(glGetUniformLocation)(GLuint program, const char *name)
+DECLARE(GLint, glGetUniformLocation, GLuint program, const char *name)
 {
 	TYPEDEF(GLint (*methodType)(GLuint, const char *));
 	BEFORE(glGetUniformLocation);
@@ -993,7 +992,7 @@ GLint REAL_NAME(glGetUniformLocation)(GLuint program, const char *name)
 }
 
 //lsh_get
-void REAL_NAME(glGetVertexAttribfv)(GLuint index, GLenum pname, GLfloat *params)
+DECLARE(void, glGetVertexAttribfv, GLuint index, GLenum pname, GLfloat *params)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLenum, GLfloat *));
 	BEFORE(glGetVertexAttribfv);
@@ -1004,7 +1003,7 @@ void REAL_NAME(glGetVertexAttribfv)(GLuint index, GLenum pname, GLfloat *params)
 }
 
 //lsh_get
-void REAL_NAME(glGetVertexAttribiv)(GLuint index, GLenum pname, GLint *params)
+DECLARE(void, glGetVertexAttribiv, GLuint index, GLenum pname, GLint *params)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLenum, GLint *));
 	BEFORE(glGetVertexAttribiv);
@@ -1015,7 +1014,7 @@ void REAL_NAME(glGetVertexAttribiv)(GLuint index, GLenum pname, GLint *params)
 }
 
 //lsh_get
-void REAL_NAME(glGetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid **pointer)
+DECLARE(void, glGetVertexAttribPointerv, GLuint index, GLenum pname, GLvoid **pointer)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLenum, GLvoid **));
 	BEFORE(glGetVertexAttribPointerv);
@@ -1029,7 +1028,7 @@ void REAL_NAME(glGetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid **p
 // H 1
 // ==================================================================
 
-void REAL_NAME(glHint)(GLenum target, GLenum mode)
+DECLARE(void, glHint, GLenum target, GLenum mode)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum));
 	BEFORE(glHint);
@@ -1043,7 +1042,7 @@ void REAL_NAME(glHint)(GLenum target, GLenum mode)
 // I 7
 // ==================================================================
 
-GLboolean REAL_NAME(glIsBuffer)(GLuint buffer)
+DECLARE(GLboolean, glIsBuffer, GLuint buffer)
 {
 	TYPEDEF(GLboolean (*methodType)(GLuint));
 	BEFORE(glIsBuffer);
@@ -1054,7 +1053,7 @@ GLboolean REAL_NAME(glIsBuffer)(GLuint buffer)
 	return ret;
 }
 
-GLboolean REAL_NAME(glIsEnabled)(GLenum cap)
+DECLARE(GLboolean, glIsEnabled, GLenum cap)
 {
 	TYPEDEF(GLboolean (*methodType)(GLenum));
 	BEFORE(glIsEnabled);
@@ -1065,7 +1064,7 @@ GLboolean REAL_NAME(glIsEnabled)(GLenum cap)
 	return ret;
 }
 
-GLboolean REAL_NAME(glIsFramebuffer)(GLuint framebuffer)
+DECLARE(GLboolean, glIsFramebuffer, GLuint framebuffer)
 {
 	TYPEDEF(GLboolean (*methodType)(GLuint));
 	BEFORE(glIsFramebuffer);
@@ -1076,7 +1075,7 @@ GLboolean REAL_NAME(glIsFramebuffer)(GLuint framebuffer)
 	return ret;
 }
 
-GLboolean REAL_NAME(glIsProgram)(GLuint program)
+DECLARE(GLboolean, glIsProgram, GLuint program)
 {
 	TYPEDEF(GLboolean (*methodType)(GLuint));
 	BEFORE(glIsProgram);
@@ -1087,7 +1086,7 @@ GLboolean REAL_NAME(glIsProgram)(GLuint program)
 	return ret;
 }
 
-GLboolean REAL_NAME(glIsRenderbuffer)(GLuint renderbuffer)
+DECLARE(GLboolean, glIsRenderbuffer, GLuint renderbuffer)
 {
 	TYPEDEF(GLboolean (*methodType)(GLuint));
 	BEFORE(glIsRenderbuffer);
@@ -1098,7 +1097,7 @@ GLboolean REAL_NAME(glIsRenderbuffer)(GLuint renderbuffer)
 	return ret;
 }
 
-GLboolean REAL_NAME(glIsShader)(GLuint shader)
+DECLARE(GLboolean, glIsShader, GLuint shader)
 {
 	TYPEDEF(GLboolean (*methodType)(GLuint));
 	BEFORE(glIsShader);
@@ -1109,7 +1108,7 @@ GLboolean REAL_NAME(glIsShader)(GLuint shader)
 	return ret;
 }
 
-GLboolean REAL_NAME(glIsTexture)(GLuint texture)
+DECLARE(GLboolean, glIsTexture, GLuint texture)
 {
 	TYPEDEF(GLboolean (*methodType)(GLuint));
 	BEFORE(glIsTexture);
@@ -1124,7 +1123,7 @@ GLboolean REAL_NAME(glIsTexture)(GLuint texture)
 // L 2
 // ==================================================================
 
-void REAL_NAME(glLineWidth)(GLfloat width)
+DECLARE(void, glLineWidth, GLfloat width)
 {
 	TYPEDEF(void (*methodType)(GLfloat));
 	BEFORE(glLineWidth);
@@ -1134,7 +1133,7 @@ void REAL_NAME(glLineWidth)(GLfloat width)
 }
 
 /* TODO refactor snprintf check*/
-void REAL_NAME(glLinkProgram)(GLuint program)
+DECLARE(void, glLinkProgram, GLuint program)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glLinkProgram);
@@ -1214,7 +1213,7 @@ void REAL_NAME(glLinkProgram)(GLuint program)
 // P 2
 // ==================================================================
 
-void REAL_NAME(glPixelStorei)(GLenum pname, GLint param)
+DECLARE(void, glPixelStorei, GLenum pname, GLint param)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLint));
 	BEFORE(glPixelStorei);
@@ -1224,7 +1223,7 @@ void REAL_NAME(glPixelStorei)(GLenum pname, GLint param)
 	      (uint64_t)(pname), param);
 }
 
-void REAL_NAME(glPolygonOffset)(GLfloat factor, GLfloat units)
+DECLARE(void, glPolygonOffset, GLfloat factor, GLfloat units)
 {
 	TYPEDEF(void (*methodType)(GLfloat, GLfloat));
 	BEFORE(glPolygonOffset);
@@ -1239,7 +1238,7 @@ void REAL_NAME(glPolygonOffset)(GLfloat factor, GLfloat units)
 // ==================================================================
 
 //lsh_get
-void REAL_NAME(glReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height,
+DECLARE(void, glReadPixels, GLint x, GLint y, GLsizei width, GLsizei height,
 		  GLenum format, GLenum type, GLvoid * data)
 {
 	TYPEDEF(void (*methodType)(GLint, GLint, GLsizei, GLsizei, GLenum,
@@ -1252,7 +1251,7 @@ void REAL_NAME(glReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height,
 	      (uint64_t)(format), (uint64_t)(type));
 }
 
-void REAL_NAME(glReleaseShaderCompiler)(void)
+DECLARE_NOARGS(void, glReleaseShaderCompiler)
 {
 	TYPEDEF(void (*methodType)(void));
 	BEFORE(glReleaseShaderCompiler);
@@ -1260,8 +1259,7 @@ void REAL_NAME(glReleaseShaderCompiler)(void)
 	GL_GET_ERROR();
 	AFTER_NO_PARAM('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "");
 }
-
-void REAL_NAME(glRenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width,
+DECLARE(void, glRenderbufferStorage, GLenum target, GLenum internalformat, GLsizei width,
 			   GLsizei height)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLsizei, GLsizei));
@@ -1276,7 +1274,7 @@ void REAL_NAME(glRenderbufferStorage)(GLenum target, GLenum internalformat, GLsi
 // S 10
 // ==================================================================
 
-void REAL_NAME(glSampleCoverage)(GLclampf value, GLboolean invert)
+DECLARE(void, glSampleCoverage, GLclampf value, GLboolean invert)
 {
 	TYPEDEF(void (*methodType)(GLclampf, GLboolean));
 	BEFORE(glSampleCoverage);
@@ -1286,7 +1284,7 @@ void REAL_NAME(glSampleCoverage)(GLclampf value, GLboolean invert)
 	      value, (uint64_t)(invert));
 }
 
-void REAL_NAME(glScissor)(GLint x, GLint y, GLsizei width, GLsizei height)
+DECLARE(void, glScissor, GLint x, GLint y, GLsizei width, GLsizei height)
 {
 	TYPEDEF(void (*methodType)(GLint, GLint, GLsizei, GLsizei));
 	BEFORE(glScissor);
@@ -1297,7 +1295,7 @@ void REAL_NAME(glScissor)(GLint x, GLint y, GLsizei width, GLsizei height)
 }
 
 //lsh_param
-void REAL_NAME(glShaderBinary)(GLsizei n, const GLuint *shaders, GLenum binaryformat,
+DECLARE(void, glShaderBinary, GLsizei n, const GLuint *shaders, GLenum binaryformat,
 		    const void *binary, GLsizei length)
 {
 	TYPEDEF(void (*methodType)(GLsizei, const GLuint *, GLenum,
@@ -1311,7 +1309,7 @@ void REAL_NAME(glShaderBinary)(GLsizei n, const GLuint *shaders, GLenum binaryfo
 }
 
 //lsh_param
-void REAL_NAME(glShaderSource)(GLuint shader, GLsizei count, const char **string,
+DECLARE(void, glShaderSource, GLuint shader, GLsizei count, const char **string,
 		    const GLint *length)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLsizei, const char **,
@@ -1334,7 +1332,7 @@ void REAL_NAME(glShaderSource)(GLuint shader, GLsizei count, const char **string
 	}
 }
 
-void REAL_NAME(glStencilFunc)(GLenum func, GLint ref, GLuint mask)
+DECLARE(void, glStencilFunc, GLenum func, GLint ref, GLuint mask)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLint, GLint));
 	BEFORE(glStencilFunc);
@@ -1344,7 +1342,7 @@ void REAL_NAME(glStencilFunc)(GLenum func, GLint ref, GLuint mask)
 	      (uint64_t)(func), ref, mask);
 }
 
-void REAL_NAME(glStencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuint mask)
+DECLARE(void, glStencilFuncSeparate, GLenum face, GLenum func, GLint ref, GLuint mask)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLint, GLuint));
 	BEFORE(glStencilFuncSeparate);
@@ -1354,7 +1352,7 @@ void REAL_NAME(glStencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuin
 	      (uint64_t)(face), (uint64_t)(func), ref, mask);
 }
 
-void REAL_NAME(glStencilMask)(GLuint mask)
+DECLARE(void, glStencilMask, GLuint mask)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glStencilMask);
@@ -1363,7 +1361,7 @@ void REAL_NAME(glStencilMask)(GLuint mask)
 	AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", mask);
 }
 
-void REAL_NAME(glStencilMaskSeparate)(GLenum face, GLuint mask)
+DECLARE(void, glStencilMaskSeparate, GLenum face, GLuint mask)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLuint));
 	BEFORE(glStencilMaskSeparate);
@@ -1373,7 +1371,7 @@ void REAL_NAME(glStencilMaskSeparate)(GLenum face, GLuint mask)
 	      (uint64_t)(face), mask);
 }
 
-void REAL_NAME(glStencilOp)(GLenum sfail, GLenum dpfail, GLenum dppass)
+DECLARE(void, glStencilOp, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLenum));
 	BEFORE(glStencilOp);
@@ -1384,7 +1382,7 @@ void REAL_NAME(glStencilOp)(GLenum sfail, GLenum dpfail, GLenum dppass)
 	      (uint64_t)(dppass));
 }
 
-void REAL_NAME(glStencilOpSeparate)(GLenum face, GLenum sfail, GLenum dpfail,
+DECLARE(void, glStencilOpSeparate, GLenum face, GLenum sfail, GLenum dpfail,
 			 GLenum dppass)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLenum, GLenum));
@@ -1400,7 +1398,7 @@ void REAL_NAME(glStencilOpSeparate)(GLenum face, GLenum sfail, GLenum dpfail,
 // T 6
 // ==================================================================
 
-void REAL_NAME(glTexImage2D)(GLenum target, GLint level, GLenum internalformat,
+DECLARE(void, glTexImage2D, GLenum target, GLint level, GLenum internalformat,
 		  GLsizei width, GLsizei height, GLint border, GLenum format,
 		  GLenum type, const GLvoid *data)
 {
@@ -1416,7 +1414,7 @@ void REAL_NAME(glTexImage2D)(GLenum target, GLint level, GLenum internalformat,
 	      voidp_to_uint64(data));
 }
 
-void REAL_NAME(glTexParameterf)(GLenum target, GLenum pname, GLfloat param)
+DECLARE(void, glTexParameterf, GLenum target, GLenum pname, GLfloat param)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLfloat));
 	BEFORE(glTexParameterf);
@@ -1426,7 +1424,7 @@ void REAL_NAME(glTexParameterf)(GLenum target, GLenum pname, GLfloat param)
 	      (uint64_t)(target), (uint64_t)(pname), param);
 }
 
-void REAL_NAME(glTexParameterfv)(GLenum target, GLenum pname, const GLfloat * params)
+DECLARE(void, glTexParameterfv, GLenum target, GLenum pname, const GLfloat * params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, const GLfloat *));
 	BEFORE(glTexParameterfv);
@@ -1445,7 +1443,7 @@ void REAL_NAME(glTexParameterfv)(GLenum target, GLenum pname, const GLfloat * pa
 	}
 }
 
-void REAL_NAME(glTexParameteri)(GLenum target, GLenum pname, GLint param)
+DECLARE(void, glTexParameteri, GLenum target, GLenum pname, GLint param)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, GLint));
 	BEFORE(glTexParameteri);
@@ -1456,7 +1454,7 @@ void REAL_NAME(glTexParameteri)(GLenum target, GLenum pname, GLint param)
 	      (uint64_t)(param));
 }
 
-void REAL_NAME(glTexParameteriv)(GLenum target, GLenum pname, const GLint * params)
+DECLARE(void, glTexParameteriv, GLenum target, GLenum pname, const GLint * params)
 {
 	TYPEDEF(void (*methodType)(GLenum, GLenum, const GLint *));
 	BEFORE(glTexParameteriv);
@@ -1476,7 +1474,7 @@ void REAL_NAME(glTexParameteriv)(GLenum target, GLenum pname, const GLint * para
 	}
 }
 
-void REAL_NAME(glTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+DECLARE(void, glTexSubImage2D, GLenum target, GLint level, GLint xoffset, GLint yoffset,
 		     GLsizei width, GLsizei height, GLenum format, GLenum type,
 		     const GLvoid * data)
 {
@@ -1496,7 +1494,7 @@ void REAL_NAME(glTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint
 // U 20
 // ==================================================================
 
-void REAL_NAME(glUniform1f)(GLint location, GLfloat v0)
+DECLARE(void, glUniform1f, GLint location, GLfloat v0)
 {
 	TYPEDEF(void (*methodType)(GLint, GLfloat));
 	BEFORE(glUniform1f);
@@ -1506,7 +1504,7 @@ void REAL_NAME(glUniform1f)(GLint location, GLfloat v0)
 	      location, v0);
 }
 
-void REAL_NAME(glUniform2f)(GLint location, GLfloat v0, GLfloat v1)
+DECLARE(void, glUniform2f, GLint location, GLfloat v0, GLfloat v1)
 {
 	TYPEDEF(void (*methodType)(GLint, GLfloat, GLfloat));
 	BEFORE(glUniform2f);
@@ -1516,7 +1514,7 @@ void REAL_NAME(glUniform2f)(GLint location, GLfloat v0, GLfloat v1)
 	      location, v0, v1);
 }
 
-void REAL_NAME(glUniform3f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
+DECLARE(void, glUniform3f, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
 	TYPEDEF(void (*methodType)(GLint, GLfloat, GLfloat, GLfloat));
 	BEFORE(glUniform3f);
@@ -1526,7 +1524,7 @@ void REAL_NAME(glUniform3f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 	      location, v0, v1, v2);
 }
 
-void REAL_NAME(glUniform4f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
+DECLARE(void, glUniform4f, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
 	TYPEDEF(void (*methodType)(GLint, GLfloat, GLfloat, GLfloat, GLfloat));
 	BEFORE(glUniform4f);
@@ -1536,7 +1534,7 @@ void REAL_NAME(glUniform4f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
 	      location, v0, v1, v2, v3);
 }
 
-void REAL_NAME(glUniform1fv)(GLint location, GLsizei count, const GLfloat *value)
+DECLARE(void, glUniform1fv, GLint location, GLsizei count, const GLfloat *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, const GLfloat *));
 	BEFORE(glUniform1fv);
@@ -1546,7 +1544,7 @@ void REAL_NAME(glUniform1fv)(GLint location, GLsizei count, const GLfloat *value
 	      location, count, count * 1, voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniform2fv)(GLint location, GLsizei count, const GLfloat *value)
+DECLARE(void, glUniform2fv, GLint location, GLsizei count, const GLfloat *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, const GLfloat *));
 	BEFORE(glUniform2fv);
@@ -1556,7 +1554,7 @@ void REAL_NAME(glUniform2fv)(GLint location, GLsizei count, const GLfloat *value
 	      location, count, count * 2, voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniform3fv)(GLint location, GLsizei count, const GLfloat *value)
+DECLARE(void, glUniform3fv, GLint location, GLsizei count, const GLfloat *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, const GLfloat *));
 	BEFORE(glUniform3fv);
@@ -1566,7 +1564,7 @@ void REAL_NAME(glUniform3fv)(GLint location, GLsizei count, const GLfloat *value
 	      location, count, count * 3, voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniform4fv)(GLint location, GLsizei count, const GLfloat *value)
+DECLARE(void, glUniform4fv, GLint location, GLsizei count, const GLfloat *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, const GLfloat *));
 	BEFORE(glUniform4fv);
@@ -1576,7 +1574,7 @@ void REAL_NAME(glUniform4fv)(GLint location, GLsizei count, const GLfloat *value
 	      location, count, count * 4, voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniform1i)(GLint location, GLint v0)
+DECLARE(void, glUniform1i, GLint location, GLint v0)
 {
 	TYPEDEF(void (*methodType)(GLint, GLint));
 	BEFORE(glUniform1i);
@@ -1586,7 +1584,7 @@ void REAL_NAME(glUniform1i)(GLint location, GLint v0)
 	      location, v0);
 }
 
-void REAL_NAME(glUniform2i)(GLint location, GLint v0, GLint v1)
+DECLARE(void, glUniform2i, GLint location, GLint v0, GLint v1)
 {
 	TYPEDEF(void (*methodType)(GLint, GLint, GLint));
 	BEFORE(glUniform2i);
@@ -1596,7 +1594,7 @@ void REAL_NAME(glUniform2i)(GLint location, GLint v0, GLint v1)
 	      location, v0, v1);
 }
 
-void REAL_NAME(glUniform3i)(GLint location, GLint v0, GLint v1, GLint v2)
+DECLARE(void, glUniform3i, GLint location, GLint v0, GLint v1, GLint v2)
 {
 	TYPEDEF(void (*methodType)(GLint, GLint, GLint, GLint));
 	BEFORE(glUniform3i);
@@ -1606,7 +1604,7 @@ void REAL_NAME(glUniform3i)(GLint location, GLint v0, GLint v1, GLint v2)
 	      location, v0, v1, v2);
 }
 
-void REAL_NAME(glUniform4i)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
+DECLARE(void, glUniform4i, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
 	TYPEDEF(void (*methodType)(GLint, GLint, GLint, GLint, GLint));
 	BEFORE(glUniform4i);
@@ -1616,7 +1614,7 @@ void REAL_NAME(glUniform4i)(GLint location, GLint v0, GLint v1, GLint v2, GLint
 	      location, v0, v1, v2, v3);
 }
 
-void REAL_NAME(glUniform1iv)(GLint location, GLsizei count, const GLint *value)
+DECLARE(void, glUniform1iv, GLint location, GLsizei count, const GLint *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, const GLint *));
 	BEFORE(glUniform1iv);
@@ -1626,7 +1624,7 @@ void REAL_NAME(glUniform1iv)(GLint location, GLsizei count, const GLint *value)
 	      location, count, count * 1, voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniform2iv)(GLint location, GLsizei count, const GLint *value)
+DECLARE(void, glUniform2iv, GLint location, GLsizei count, const GLint *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, const GLint *));
 	BEFORE(glUniform2iv);
@@ -1636,7 +1634,7 @@ void REAL_NAME(glUniform2iv)(GLint location, GLsizei count, const GLint *value)
 	      location, count, count * 2, voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniform3iv)(GLint location, GLsizei count, const GLint *value)
+DECLARE(void, glUniform3iv, GLint location, GLsizei count, const GLint *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, const GLint *));
 	BEFORE(glUniform3iv);
@@ -1646,7 +1644,7 @@ void REAL_NAME(glUniform3iv)(GLint location, GLsizei count, const GLint *value)
 	      location, count, count * 3, voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniform4iv)(GLint location, GLsizei count, const GLint *value)
+DECLARE(void, glUniform4iv, GLint location, GLsizei count, const GLint *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, const GLint *));
 	BEFORE(glUniform4iv);
@@ -1656,7 +1654,7 @@ void REAL_NAME(glUniform4iv)(GLint location, GLsizei count, const GLint *value)
 	      location, count, count * 4, voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose,
+DECLARE(void, glUniformMatrix2fv, GLint location, GLsizei count, GLboolean transpose,
 			const GLfloat *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, GLboolean, const GLfloat *));
@@ -1668,7 +1666,7 @@ void REAL_NAME(glUniformMatrix2fv)(GLint location, GLsizei count, GLboolean tran
 	      voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose,
+DECLARE(void, glUniformMatrix3fv, GLint location, GLsizei count, GLboolean transpose,
 			const GLfloat *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, GLboolean, const GLfloat *));
@@ -1680,7 +1678,7 @@ void REAL_NAME(glUniformMatrix3fv)(GLint location, GLsizei count, GLboolean tran
 	      voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose,
+DECLARE(void, glUniformMatrix4fv, GLint location, GLsizei count, GLboolean transpose,
 			const GLfloat *value)
 {
 	TYPEDEF(void (*methodType)(GLint, GLsizei, GLboolean, const GLfloat *));
@@ -1692,7 +1690,7 @@ void REAL_NAME(glUniformMatrix4fv)(GLint location, GLsizei count, GLboolean tran
 	      voidp_to_uint64(value));
 }
 
-void REAL_NAME(glUseProgram)(GLuint program)
+DECLARE(void, glUseProgram, GLuint program)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glUseProgram);
@@ -1706,7 +1704,7 @@ void REAL_NAME(glUseProgram)(GLuint program)
 // V 7
 // ==================================================================
 
-void REAL_NAME(glValidateProgram)(GLuint program)
+DECLARE(void, glValidateProgram, GLuint program)
 {
 	TYPEDEF(void (*methodType)(GLuint));
 	BEFORE(glValidateProgram);
@@ -1716,7 +1714,7 @@ void REAL_NAME(glValidateProgram)(GLuint program)
 	      program);
 }
 
-void REAL_NAME(glVertexAttrib1f)(GLuint index, GLfloat v0)
+DECLARE(void, glVertexAttrib1f, GLuint index, GLfloat v0)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLfloat));
 	BEFORE(glVertexAttrib1f);
@@ -1732,7 +1730,7 @@ void REAL_NAME(glVertexAttrib1f)(GLuint index, GLfloat v0)
 	      index, v0);
 }
 
-void REAL_NAME(glVertexAttrib2f)(GLuint index, GLfloat v0, GLfloat v1)
+DECLARE(void, glVertexAttrib2f, GLuint index, GLfloat v0, GLfloat v1)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLfloat, GLfloat));
 	BEFORE(glVertexAttrib2f);
@@ -1748,7 +1746,7 @@ void REAL_NAME(glVertexAttrib2f)(GLuint index, GLfloat v0, GLfloat v1)
 	      index, v0, v1);
 }
 
-void REAL_NAME(glVertexAttrib3f)(GLuint index, GLfloat v0, GLfloat v1, GLfloat v2)
+DECLARE(void, glVertexAttrib3f, GLuint index, GLfloat v0, GLfloat v1, GLfloat v2)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLfloat, GLfloat, GLfloat));
 	BEFORE(glVertexAttrib3f);
@@ -1764,7 +1762,7 @@ void REAL_NAME(glVertexAttrib3f)(GLuint index, GLfloat v0, GLfloat v1, GLfloat v
 	      index, v0, v1, v2);
 }
 
-void REAL_NAME(glVertexAttrib4f)(GLuint index, GLfloat v0, GLfloat v1, GLfloat v2,
+DECLARE(void, glVertexAttrib4f, GLuint index, GLfloat v0, GLfloat v1, GLfloat v2,
 		      GLfloat v3)
 {
 	TYPEDEF(void (*methodType)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat));
@@ -1781,7 +1779,7 @@ void REAL_NAME(glVertexAttrib4f)(GLuint index, GLfloat v0, GLfloat v1, GLfloat v
 	      index, v0, v1, v2, v3);
 }
 
-void REAL_NAME(glVertexAttrib1fv)(GLuint index, const GLfloat *v)
+DECLARE(void, glVertexAttrib1fv, GLuint index, const GLfloat *v)
 {
 	TYPEDEF(void (*methodType)(GLuint, const GLfloat *));
 	BEFORE(glVertexAttrib1fv);
@@ -1797,7 +1795,7 @@ void REAL_NAME(glVertexAttrib1fv)(GLuint index, const GLfloat *v)
 	      "dp", index, voidp_to_uint64(v));
 }
 
-void REAL_NAME(glVertexAttrib2fv)(GLuint index, const GLfloat *v)
+DECLARE(void, glVertexAttrib2fv, GLuint index, const GLfloat *v)
 {
 	TYPEDEF(void (*methodType)(GLuint, const GLfloat *));
 	BEFORE(glVertexAttrib2fv);
@@ -1813,7 +1811,7 @@ void REAL_NAME(glVertexAttrib2fv)(GLuint index, const GLfloat *v)
 	      "dp", index, voidp_to_uint64(v));
 }
 
-void REAL_NAME(glVertexAttrib3fv)(GLuint index, const GLfloat *v)
+DECLARE(void, glVertexAttrib3fv, GLuint index, const GLfloat *v)
 {
 	TYPEDEF(void (*methodType)(GLuint, const GLfloat *));
 	BEFORE(glVertexAttrib3fv);
@@ -1829,7 +1827,7 @@ void REAL_NAME(glVertexAttrib3fv)(GLuint index, const GLfloat *v)
 	      "dp", index, voidp_to_uint64(v));
 }
 
-void REAL_NAME(glVertexAttrib4fv)(GLuint index, const GLfloat *v)
+DECLARE(void, glVertexAttrib4fv, GLuint index, const GLfloat *v)
 {
 	TYPEDEF(void (*methodType)(GLuint, const GLfloat *));
 	BEFORE(glVertexAttrib4fv);
@@ -1844,7 +1842,7 @@ void REAL_NAME(glVertexAttrib4fv)(GLuint index, const GLfloat *v)
 	      "dp", index, voidp_to_uint64(v));
 }
 
-void REAL_NAME(glVertexAttribPointer)(GLuint index, GLint size, GLenum type,
+DECLARE(void, glVertexAttribPointer, GLuint index, GLint size, GLenum type,
 			   GLboolean normalized, GLsizei stride,
 			   const GLvoid *pointer)
 {
@@ -1859,7 +1857,7 @@ void REAL_NAME(glVertexAttribPointer)(GLuint index, GLint size, GLenum type,
 	      stride, voidp_to_uint64(pointer));
 }
 
-void REAL_NAME(glViewport)(GLint x, GLint y, GLsizei width, GLsizei height)
+DECLARE(void, glViewport, GLint x, GLint y, GLsizei width, GLsizei height)
 {
 	TYPEDEF(void (*methodType)(GLint, GLint, GLsizei, GLsizei));
 
diff --git a/probe_graphics/da_gles20_direct.cpp b/probe_graphics/da_gles20_direct.cpp
deleted file mode 100644
index ba06156..0000000
--- a/probe_graphics/da_gles20_direct.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  DA probe
- *
- * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact:
- *
- * Vitaliy Cherepanov <v.cherepanov@samsung.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Contributors:
- * - Samsung RnD Institute Russia
- *
- */
-
-//disable tizen redefines
-#define _GL2_MACRO_H_
-#define _GL_MACRO_H_
-
-#include "common_probe_init.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define REAL_NAME(func) PROBE_NAME(func)
-#define BEFORE BEFORE_GL_ORIG
-#define CALL_ORIG(func, ...) func##p(__VA_ARGS__)
-#define TYPEDEF(type) typedef type
-
-#include "da_gles20.inc"
-
-#ifdef __cplusplus
-} /* extern C */
-#endif
-
-#undef _GL2_MACRO_H_
-#undef _GL_MACRO_H_
-
diff --git a/probe_graphics/da_gles20_native.cpp b/probe_graphics/da_gles20_native.cpp
index 8565496..c69812e 100644
--- a/probe_graphics/da_gles20_native.cpp
+++ b/probe_graphics/da_gles20_native.cpp
@@ -30,15 +30,31 @@
  */
 #include "common_probe_init.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+#include "da_gles20.h"
+
+#define DECLARE FUNC_DECLAR
+#define DECLARE_NOARGS FUNC_DECLAR_NOARGS
 
 #define REAL_NAME(func) PROBE_NAME(func)
 #define BEFORE BEFORE_GL_ORIG
 #define CALL_ORIG(func, ...) func##p(__VA_ARGS__)
 #define TYPEDEF(type) typedef type
 
+
+
+
 #include "da_gles20.inc"
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 
 #undef CALL_ORIG
 #undef BEFORE
diff --git a/probe_graphics/da_gles20_tizen.cpp b/probe_graphics/da_gles20_tizen.cpp
index 7cf00f6..4874fca 100644
--- a/probe_graphics/da_gles20_tizen.cpp
+++ b/probe_graphics/da_gles20_tizen.cpp
@@ -35,6 +35,11 @@
 extern "C" {
 #endif
 
+#include "da_gles20.h"
+
+#define DECLARE(TYPE, FUNCNAME, ...)   TYPE REAL_NAME(FUNCNAME)(__VA_ARGS__)
+#define DECLARE_NOARGS(TYPE, FUNCNAME)   TYPE REAL_NAME(FUNCNAME)()
+
 #define REAL_NAME(func) __local_##func
 #define BEFORE BEFORE_GL_API
 #define CALL_ORIG(func, ...) __gl_api->func(__VA_ARGS__)