Prepend entry functions with their export macros.

Change-Id: I81d0021ebce2a2e846988f2cce8a0b78802e58a1
Reviewed-on: https://swiftshader-review.googlesource.com/2961
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index ffd4c5a..1fa048f 100644
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -90,7 +90,7 @@
 

 extern "C"

 {

-EGLint EGLAPIENTRY eglGetError(void)

+EGLAPI EGLint EGLAPIENTRY eglGetError(void)

 {

 	TRACE("()");

 

@@ -104,14 +104,14 @@
 	return error;

 }

 

-EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id)

+EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id)

 {

 	TRACE("(EGLNativeDisplayType display_id = %p)", display_id);

 

 	return egl::Display::getPlatformDisplay(EGL_UNKNOWN, display_id);

 }

 

-EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)

+EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLint *major = %p, EGLint *minor = %p)",

 		  dpy, major, minor);

@@ -134,7 +134,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)

+EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)

 {

 	TRACE("(EGLDisplay dpy = %p)", dpy);

 

@@ -150,16 +150,16 @@
 	return success(EGL_TRUE);

 }

 

-const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)

+EGLAPI const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLint name = %d)", dpy, name);

 

 	if(dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS)

 	{

 		return success("EGL_KHR_platform_gbm "

-						"EGL_KHR_platform_x11 "

-						"EGL_EXT_client_extensions "

-						"EGL_EXT_platform_base");

+		               "EGL_KHR_platform_x11 "

+		               "EGL_EXT_client_extensions "

+		               "EGL_EXT_platform_base");

 	}

 

 	egl::Display *display = static_cast<egl::Display*>(dpy);

@@ -175,9 +175,9 @@
 		return success("OpenGL_ES");

 	case EGL_EXTENSIONS:

 		return success("EGL_KHR_gl_texture_2D_image "

-						"EGL_KHR_gl_texture_cubemap_image "

-						"EGL_KHR_gl_renderbuffer_image "

-						"EGL_KHR_image_base");

+		               "EGL_KHR_gl_texture_cubemap_image "

+		               "EGL_KHR_gl_renderbuffer_image "

+		               "EGL_KHR_image_base");

 	case EGL_VENDOR:

 		return success("TransGaming Inc.");

 	case EGL_VERSION:

@@ -187,7 +187,7 @@
 	return error(EGL_BAD_PARAMETER, (const char*)NULL);

 }

 

-EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)

+EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLConfig *configs = %p, "

 		  "EGLint config_size = %d, EGLint *num_config = %p)",

@@ -215,7 +215,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)

+EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)

 {

 	TRACE("(EGLDisplay dpy = %p, const EGLint *attrib_list = %p, "

 		  "EGLConfig *configs = %p, EGLint config_size = %d, EGLint *num_config = %p)",

@@ -245,7 +245,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)

+EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLint attribute = %d, EGLint *value = %p)",

 		  dpy, config, attribute, value);

@@ -265,7 +265,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLNativeWindowType win = %p, "

 		  "const EGLint *attrib_list = %p)", dpy, config, window, attrib_list);

@@ -285,7 +285,7 @@
 	return display->createWindowSurface(window, config, attrib_list);

 }

 

-EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, const EGLint *attrib_list = %p)",

 		  dpy, config, attrib_list);

@@ -300,7 +300,7 @@
 	return display->createOffscreenSurface(config, attrib_list);

 }

 

-EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLNativePixmapType pixmap = %p, "

 		  "const EGLint *attrib_list = %p)", dpy, config, pixmap, attrib_list);

@@ -317,7 +317,7 @@
 	return success(EGL_NO_SURFACE);

 }

 

-EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)

+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p)", dpy, surface);

 

@@ -339,7 +339,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)

+EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint attribute = %d, EGLint *value = %p)",

 		  dpy, surface, attribute, value);

@@ -414,7 +414,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)

+EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)

 {

 	TRACE("(EGLenum api = 0x%X)", api);

 

@@ -434,7 +434,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLenum EGLAPIENTRY eglQueryAPI(void)

+EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void)

 {

 	TRACE("()");

 

@@ -443,7 +443,7 @@
 	return success(API);

 }

 

-EGLBoolean EGLAPIENTRY eglWaitClient(void)

+EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void)

 {

 	TRACE("()");

 

@@ -452,7 +452,7 @@
 	return success(EGL_FALSE);

 }

 

-EGLBoolean EGLAPIENTRY eglReleaseThread(void)

+EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void)

 {

 	TRACE("()");

 

@@ -461,7 +461,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = %p, "

 		  "EGLConfig config = %p, const EGLint *attrib_list = %p)",

@@ -472,7 +472,7 @@
 	return error(EGL_BAD_PARAMETER, EGL_NO_SURFACE);

 }

 

-EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)

+EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint attribute = %d, EGLint value = %d)",

 		  dpy, surface, attribute, value);

@@ -508,7 +508,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)

+EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint buffer = %d)", dpy, surface, buffer);

 

@@ -550,7 +550,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)

+EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint buffer = %d)", dpy, surface, buffer);

 

@@ -587,7 +587,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)

+EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLint interval = %d)", dpy, interval);

 

@@ -610,7 +610,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)

+EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLContext share_context = %p, "

 		  "const EGLint *attrib_list = %p)", dpy, config, share_context, attrib_list);

@@ -647,7 +647,7 @@
 	return display->createContext(config, shareContext, clientVersion);

 }

 

-EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)

+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p)", dpy, ctx);

 

@@ -669,7 +669,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)

+EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLSurface draw = %p, EGLSurface read = %p, EGLContext ctx = %p)",

 		  dpy, draw, read, ctx);

@@ -726,7 +726,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLContext EGLAPIENTRY eglGetCurrentContext(void)

+EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void)

 {

 	TRACE("()");

 

@@ -735,7 +735,7 @@
 	return success(context);

 }

 

-EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)

+EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)

 {

 	TRACE("(EGLint readdraw = %d)", readdraw);

 

@@ -755,7 +755,7 @@
 	}

 }

 

-EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)

+EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)

 {

 	TRACE("()");

 

@@ -764,7 +764,7 @@
 	return success(dpy);

 }

 

-EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)

+EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p, EGLint attribute = %d, EGLint *value = %p)",

 		  dpy, ctx, attribute, value);

@@ -782,7 +782,7 @@
 	return success(0);

 }

 

-EGLBoolean EGLAPIENTRY eglWaitGL(void)

+EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void)

 {

 	TRACE("()");

 

@@ -791,7 +791,7 @@
 	return success(EGL_FALSE);

 }

 

-EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)

+EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)

 {

 	TRACE("(EGLint engine = %d)", engine);

 

@@ -800,7 +800,7 @@
 	return success(EGL_FALSE);

 }

 

-EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)

+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p)", dpy, surface);

 

@@ -822,7 +822,7 @@
 	return success(EGL_TRUE);

 }

 

-EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)

+EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLNativePixmapType target = %p)", dpy, surface, target);

 

@@ -839,7 +839,7 @@
 	return success(EGL_FALSE);

 }

 

-EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)

+EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p, EGLenum target = 0x%X, buffer = %p, const EGLint attrib_list = %p)", dpy, ctx, target, buffer, attrib_list);

 

@@ -913,7 +913,7 @@
 	return success((EGLImageKHR)image);

 }

 

-EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)

+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)

 {

 	TRACE("(EGLDisplay dpy = %p, EGLImageKHR image = %p)", dpy, image);

 

@@ -935,24 +935,24 @@
 	return success(EGL_TRUE);

 }

 

-EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)

+EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)

 {

 	TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLint *attrib_list = %p)", platform, native_display, attrib_list);

 

 	return egl::Display::getPlatformDisplay(platform, (EGLNativeDisplayType)native_display);

 }

 

-EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list)

 {

 	return eglCreateWindowSurface(dpy, config, (EGLNativeWindowType)native_window, attrib_list);

 }

 

-EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list)

 {

 	return eglCreatePixmapSurface(dpy, config, (EGLNativePixmapType)native_pixmap, attrib_list);

 }

 

-__eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)

+EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)

 {

 	TRACE("(const char *procname = \"%s\")", procname);

 

diff --git a/src/OpenGL/libGLES_CM/exports.map b/src/OpenGL/libGLES_CM/exports.map
index ce32f01..22246b1 100644
--- a/src/OpenGL/libGLES_CM/exports.map
+++ b/src/OpenGL/libGLES_CM/exports.map
@@ -1,7 +1,7 @@
 {
 global:
-	eglBindAPI;
-	eglBindTexImage;
+    eglBindAPI;
+    eglBindTexImage;
     eglChooseConfig;
     eglCopyBuffers;
     eglCreateContext;
@@ -175,8 +175,8 @@
     glVertexPointer;
     glViewport;
 
-	# Extensions
-	glPointSizePointerOES;
+    # Extensions
+    glPointSizePointerOES;
     glEGLImageTargetTexture2DOES;
     glEGLImageTargetRenderbufferStorageOES;
     glIsRenderbufferOES;
@@ -208,7 +208,7 @@
 
     libGLES_CM_swiftshader;
 
-	Register;
+    Register;
 
 local:
     *;
diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.cpp b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
index ddfe638..1996f91 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.cpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
@@ -84,187 +84,187 @@
 extern "C"

 {

 

-EGLint EGLAPIENTRY eglGetError(void)

+EGLAPI EGLint EGLAPIENTRY eglGetError(void)

 {

 	return libEGL->eglGetError();

 }

 

-EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id)

+EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id)

 {

 	return libEGL->eglGetDisplay(display_id);

 }

 

-EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)

+EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)

 {

 	return libEGL->eglInitialize(dpy, major, minor);

 }

 

-EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)

+EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)

 {

 	return libEGL->eglTerminate(dpy);

 }

 

-const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)

+EGLAPI const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)

 {

 	return libEGL->eglQueryString(dpy, name);

 }

 

-EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)

+EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)

 {

 	return libEGL->eglGetConfigs(dpy, configs, config_size, num_config);

 }

 

-EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)

+EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)

 {

 	return libEGL->eglChooseConfig(dpy, attrib_list, configs, config_size, num_config);

 }

 

-EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)

+EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)

 {

 	return libEGL->eglGetConfigAttrib(dpy, config, attribute, value);

 }

 

-EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list)

 {

 	return libEGL->eglCreateWindowSurface(dpy, config, window, attrib_list);

 }

 

-EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)

 {

 	return libEGL->eglCreatePbufferSurface(dpy, config, attrib_list);

 }

 

-EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)

 {

 	return libEGL->eglCreatePixmapSurface(dpy, config, pixmap, attrib_list);

 }

 

-EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)

+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)

 {

 	return libEGL->eglDestroySurface(dpy, surface);

 }

 

-EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)

+EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)

 {

 	return libEGL->eglQuerySurface(dpy, surface, attribute, value);

 }

 

-EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)

+EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)

 {

 	return libEGL->eglBindAPI(api);

 }

 

-EGLenum EGLAPIENTRY eglQueryAPI(void)

+EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void)

 {

 	return libEGL->eglQueryAPI();

 }

 

-EGLBoolean EGLAPIENTRY eglWaitClient(void)

+EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void)

 {

 	return libEGL->eglWaitClient();

 }

 

-EGLBoolean EGLAPIENTRY eglReleaseThread(void)

+EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void)

 {

 	return libEGL->eglReleaseThread();

 }

 

-EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)

+EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)

 {

 	return libEGL->eglCreatePbufferFromClientBuffer(dpy, buftype, buffer, config, attrib_list);

 }

 

-EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)

+EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)

 {

 	return libEGL->eglSurfaceAttrib(dpy, surface, attribute, value);

 }

 

-EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)

+EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)

 {

 	return libEGL->eglBindTexImage(dpy, surface, buffer);

 }

 

-EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)

+EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)

 {

 	return libEGL->eglReleaseTexImage(dpy, surface, buffer);

 }

 

-EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)

+EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)

 {

 	return libEGL->eglSwapInterval(dpy, interval);

 }

 

-EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)

+EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)

 {

 	return libEGL->eglCreateContext(dpy, config, share_context, attrib_list);

 }

 

-EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)

+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)

 {

 	return libEGL->eglDestroyContext(dpy, ctx);

 }

 

-EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)

+EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)

 {

 	return libEGL->eglMakeCurrent(dpy, draw, read, ctx);

 }

 

-EGLContext EGLAPIENTRY eglGetCurrentContext(void)

+EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void)

 {

 	return libEGL->eglGetCurrentContext();

 }

 

-EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)

+EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)

 {

 	return libEGL->eglGetCurrentSurface(readdraw);

 }

 

-EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)

+EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)

 {

 	return libEGL->eglGetCurrentDisplay();

 }

 

-EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)

+EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)

 {

 	return libEGL->eglQueryContext(dpy, ctx, attribute, value);

 }

 

-EGLBoolean EGLAPIENTRY eglWaitGL(void)

+EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void)

 {

 	return libEGL->eglWaitGL();

 }

 

-EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)

+EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)

 {

 	return libEGL->eglWaitNative(engine);

 }

 

-EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)

+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)

 {

 	return libEGL->eglSwapBuffers(dpy, surface);

 }

 

-EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)

+EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)

 {

 	return libEGL->eglCopyBuffers(dpy, surface, target);

 }

 

-EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)

+EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)

 {

 	return libEGL->eglCreateImageKHR(dpy, ctx, target, buffer, attrib_list);

 }

 

-EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)

+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)

 {

 	return libEGL->eglDestroyImageKHR(dpy, image);

 }

 

-__eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)

+EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)

 {

 	return libEGL->eglGetProcAddress(procname);

 }

 

-void GL_APIENTRY glActiveTexture(GLenum texture)

+GL_API void GL_APIENTRY glActiveTexture(GLenum texture)

 {

 	TRACE("(GLenum texture = 0x%X)", texture);

 

@@ -281,17 +281,17 @@
 	}

 }

 

-void GL_APIENTRY glAlphaFunc(GLenum func, GLclampf ref)

+GL_API void GL_APIENTRY glAlphaFunc(GLenum func, GLclampf ref)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glAlphaFuncx(GLenum func, GLclampx ref)

+GL_API void GL_APIENTRY glAlphaFuncx(GLenum func, GLclampx ref)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer)

+GL_API void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer)

 {

 	TRACE("(GLenum target = 0x%X, GLuint buffer = %d)", target, buffer);

 

@@ -313,7 +313,7 @@
 	}

 }

 

-void GL_APIENTRY glBindFramebuffer(GLenum target, GLuint framebuffer)

+GL_API void GL_APIENTRY glBindFramebuffer(GLenum target, GLuint framebuffer)

 {

 	TRACE("(GLenum target = 0x%X, GLuint framebuffer = %d)", target, framebuffer);

 

@@ -330,7 +330,7 @@
 	}

 }

 

-void GL_APIENTRY glBindFramebufferOES(GLenum target, GLuint framebuffer)

+GL_API void GL_APIENTRY glBindFramebufferOES(GLenum target, GLuint framebuffer)

 {

 	TRACE("(GLenum target = 0x%X, GLuint framebuffer = %d)", target, framebuffer);

 

@@ -347,7 +347,7 @@
 	}

 }

 

-void GL_APIENTRY glBindRenderbufferOES(GLenum target, GLuint renderbuffer)

+GL_API void GL_APIENTRY glBindRenderbufferOES(GLenum target, GLuint renderbuffer)

 {

 	TRACE("(GLenum target = 0x%X, GLuint renderbuffer = %d)", target, renderbuffer);

 

@@ -373,7 +373,7 @@
 	}

 }

 

-void GL_APIENTRY glBindTexture(GLenum target, GLuint texture)

+GL_API void GL_APIENTRY glBindTexture(GLenum target, GLuint texture)

 {

 	TRACE("(GLenum target = 0x%X, GLuint texture = %d)", target, texture);

 

@@ -402,14 +402,14 @@
 	}

 }

 

-void GL_APIENTRY glBlendEquationSeparateOES(GLenum modeRGB, GLenum modeAlpha);

+GL_API void GL_APIENTRY glBlendEquationSeparateOES(GLenum modeRGB, GLenum modeAlpha);

 

-void GL_APIENTRY glBlendEquationOES(GLenum mode)

+GL_API void GL_APIENTRY glBlendEquationOES(GLenum mode)

 {

 	glBlendEquationSeparateOES(mode, mode);

 }

 

-void GL_APIENTRY glBlendEquationSeparateOES(GLenum modeRGB, GLenum modeAlpha)

+GL_API void GL_APIENTRY glBlendEquationSeparateOES(GLenum modeRGB, GLenum modeAlpha)

 {

 	TRACE("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);

 

@@ -445,14 +445,14 @@
 	}

 }

 

-void GL_APIENTRY glBlendFuncSeparateOES(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);

+GL_API void GL_APIENTRY glBlendFuncSeparateOES(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);

 

-void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor)

+GL_API void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor)

 {

 	glBlendFuncSeparateOES(sfactor, dfactor, sfactor, dfactor);

 }

 

-void GL_APIENTRY glBlendFuncSeparateOES(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)

+GL_API void GL_APIENTRY glBlendFuncSeparateOES(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)

 {

 	TRACE("(GLenum srcRGB = 0x%X, GLenum dstRGB = 0x%X, GLenum srcAlpha = 0x%X, GLenum dstAlpha = 0x%X)",

 		  srcRGB, dstRGB, srcAlpha, dstAlpha);

@@ -535,7 +535,7 @@
 	}

 }

 

-void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage)

+GL_API void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage)

 {

 	size = static_cast<GLint>(size);   // Work around issues with some 64-bit applications

 

@@ -583,7 +583,7 @@
 	}

 }

 

-void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data)

+GL_API void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data)

 {

 	size = static_cast<GLint>(size);   // Work around issues with some 64-bit applications

 	offset = static_cast<GLint>(offset);

@@ -633,7 +633,7 @@
 	}

 }

 

-GLenum GL_APIENTRY glCheckFramebufferStatusOES(GLenum target)

+GL_API GLenum GL_APIENTRY glCheckFramebufferStatusOES(GLenum target)

 {

 	TRACE("(GLenum target = 0x%X)", target);

 

@@ -654,7 +654,7 @@
 	return 0;

 }

 

-void GL_APIENTRY glClear(GLbitfield mask)

+GL_API void GL_APIENTRY glClear(GLbitfield mask)

 {

 	TRACE("(GLbitfield mask = %X)", mask);

 

@@ -671,7 +671,7 @@
 	}

 }

 

-void GL_APIENTRY glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)

+GL_API void GL_APIENTRY glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)

 {

 	TRACE("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",

 	      red, green, blue, alpha);

@@ -684,12 +684,12 @@
 	}

 }

 

-void GL_APIENTRY glClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)

+GL_API void GL_APIENTRY glClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glClearDepthf(GLclampf depth)

+GL_API void GL_APIENTRY glClearDepthf(GLclampf depth)

 {

 	TRACE("(GLclampf depth = %f)", depth);

 

@@ -701,12 +701,12 @@
 	}

 }

 

-void GL_APIENTRY glClearDepthx(GLclampx depth)

+GL_API void GL_APIENTRY glClearDepthx(GLclampx depth)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glClearStencil(GLint s)

+GL_API void GL_APIENTRY glClearStencil(GLint s)

 {

 	TRACE("(GLint s = %d)", s);

 

@@ -718,7 +718,7 @@
 	}

 }

 

-void GL_APIENTRY glClientActiveTexture(GLenum texture)

+GL_API void GL_APIENTRY glClientActiveTexture(GLenum texture)

 {

 	TRACE("(GLenum texture = 0x%X)", texture);

 

@@ -739,17 +739,17 @@
 	}

 }

 

-void GL_APIENTRY glClipPlanef(GLenum plane, const GLfloat *equation)

+GL_API void GL_APIENTRY glClipPlanef(GLenum plane, const GLfloat *equation)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glClipPlanex(GLenum plane, const GLfixed *equation)

+GL_API void GL_APIENTRY glClipPlanex(GLenum plane, const GLfixed *equation)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)

+GL_API void GL_APIENTRY glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)

 {

 	TRACE("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red, green, blue, alpha);

 

@@ -761,17 +761,17 @@
 	}

 }

 

-void GL_APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)

+GL_API void GL_APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glColor4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)

+GL_API void GL_APIENTRY glColor4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)

+GL_API void GL_APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)

 {

 	TRACE("(GLboolean red = %d, GLboolean green = %d, GLboolean blue = %d, GLboolean alpha = %d)",

 	      red, green, blue, alpha);

@@ -784,7 +784,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr)

+GL_API void GL_APIENTRY glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr)

 {

 	TRACE("(GLuint index = %d, GLint size = %d, GLenum type = 0x%X, "

 	      "GLboolean normalized = %d, GLsizei stride = %d, const GLvoid* ptr = %p)",

@@ -826,15 +826,15 @@
 	}

 }

 

-void GL_APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)

+GL_API void GL_APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)

 {

 	TRACE("(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const GLvoid *pointer = %p)", size, type, stride, pointer);

 

 	glVertexAttribPointer(sw::Color0, size, type, false, stride, pointer);

 }

 

-void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height,

-                                        GLint border, GLsizei imageSize, const GLvoid* data)

+GL_API void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height,

+                                               GLint border, GLsizei imageSize, const GLvoid* data)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, "

 	      "GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const GLvoid* data = %p)",

@@ -912,8 +912,8 @@
 	}

 }

 

-void GL_APIENTRY glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,

-                                           GLenum format, GLsizei imageSize, const GLvoid* data)

+GL_API void GL_APIENTRY glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,

+                                                  GLenum format, GLsizei imageSize, const GLvoid* data)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 	      "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, "

@@ -983,7 +983,7 @@
 	}

 }

 

-void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)

+GL_API void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "

 	      "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)",

@@ -1007,7 +1007,7 @@
 		{

 		case GL_TEXTURE_2D:

 			if(width > (es1::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level) ||

-				height > (es1::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level))

+			   height > (es1::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level))

 			{

 				return error(GL_INVALID_VALUE);

 			}

@@ -1098,7 +1098,7 @@
 	}

 }

 

-void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)

+GL_API void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 	      "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",

@@ -1220,7 +1220,7 @@
 	}

 }

 

-void GL_APIENTRY glCullFace(GLenum mode)

+GL_API void GL_APIENTRY glCullFace(GLenum mode)

 {

 	TRACE("(GLenum mode = 0x%X)", mode);

 

@@ -1243,7 +1243,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteBuffers(GLsizei n, const GLuint* buffers)

+GL_API void GL_APIENTRY glDeleteBuffers(GLsizei n, const GLuint* buffers)

 {

 	TRACE("(GLsizei n = %d, const GLuint* buffers = %p)", n, buffers);

 

@@ -1263,7 +1263,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteFramebuffersOES(GLsizei n, const GLuint* framebuffers)

+GL_API void GL_APIENTRY glDeleteFramebuffersOES(GLsizei n, const GLuint* framebuffers)

 {

 	TRACE("(GLsizei n = %d, const GLuint* framebuffers = %p)", n, framebuffers);

 

@@ -1286,7 +1286,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteRenderbuffersOES(GLsizei n, const GLuint* renderbuffers)

+GL_API void GL_APIENTRY glDeleteRenderbuffersOES(GLsizei n, const GLuint* renderbuffers)

 {

 	TRACE("(GLsizei n = %d, const GLuint* renderbuffers = %p)", n, renderbuffers);

 

@@ -1306,7 +1306,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint* textures)

+GL_API void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint* textures)

 {

 	TRACE("(GLsizei n = %d, const GLuint* textures = %p)", n, textures);

 

@@ -1329,7 +1329,7 @@
 	}

 }

 

-void GL_APIENTRY glDepthFunc(GLenum func)

+GL_API void GL_APIENTRY glDepthFunc(GLenum func)

 {

 	TRACE("(GLenum func = 0x%X)", func);

 

@@ -1356,7 +1356,7 @@
 	}

 }

 

-void GL_APIENTRY glDepthMask(GLboolean flag)

+GL_API void GL_APIENTRY glDepthMask(GLboolean flag)

 {

 	TRACE("(GLboolean flag = %d)", flag);

 

@@ -1368,12 +1368,12 @@
 	}

 }

 

-void GL_APIENTRY glDepthRangex(GLclampx zNear, GLclampx zFar)

+GL_API void GL_APIENTRY glDepthRangex(GLclampx zNear, GLclampx zFar)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDepthRangef(GLclampf zNear, GLclampf zFar)

+GL_API void GL_APIENTRY glDepthRangef(GLclampf zNear, GLclampf zFar)

 {

 	TRACE("(GLclampf zNear = %f, GLclampf zFar = %f)", zNear, zFar);

 

@@ -1385,7 +1385,7 @@
 	}

 }

 

-void GL_APIENTRY glDisable(GLenum cap)

+GL_API void GL_APIENTRY glDisable(GLenum cap)

 {

 	TRACE("(GLenum cap = 0x%X)", cap);

 

@@ -1434,7 +1434,7 @@
 	}

 }

 

-void GL_APIENTRY glDisableClientState(GLenum array)

+GL_API void GL_APIENTRY glDisableClientState(GLenum array)

 {

 	TRACE("(GLenum array = 0x%X)", array);

 

@@ -1455,7 +1455,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count)

+GL_API void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count)

 {

 	TRACE("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count);

 

@@ -1472,7 +1472,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices)

+GL_API void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices)

 {

 	TRACE("(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const GLvoid* indices = %p)",

 	      mode, count, type, indices);

@@ -1500,7 +1500,7 @@
 	}

 }

 

-void GL_APIENTRY glEnable(GLenum cap)

+GL_API void GL_APIENTRY glEnable(GLenum cap)

 {

 	TRACE("(GLenum cap = 0x%X)", cap);

 

@@ -1549,7 +1549,7 @@
 	}

 }

 

-void GL_APIENTRY glEnableClientState(GLenum array)

+GL_API void GL_APIENTRY glEnableClientState(GLenum array)

 {

 	TRACE("(GLenum array = 0x%X)", array);

 

@@ -1570,7 +1570,7 @@
 	}

 }

 

-void GL_APIENTRY glFinish(void)

+GL_API void GL_APIENTRY glFinish(void)

 {

 	TRACE("()");

 

@@ -1582,7 +1582,7 @@
 	}

 }

 

-void GL_APIENTRY glFlush(void)

+GL_API void GL_APIENTRY glFlush(void)

 {

 	TRACE("()");

 

@@ -1594,7 +1594,7 @@
 	}

 }

 

-void GL_APIENTRY glFramebufferRenderbufferOES(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)

+GL_API void GL_APIENTRY glFramebufferRenderbufferOES(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)

 {

 	TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, "

 	      "GLuint renderbuffer = %d)", target, attachment, renderbuffertarget, renderbuffer);

@@ -1633,7 +1633,7 @@
 	}

 }

 

-void GL_APIENTRY glFramebufferTexture2DOES(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)

+GL_API void GL_APIENTRY glFramebufferTexture2DOES(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)

 {

 	TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "

 	      "GLuint texture = %d, GLint level = %d)", target, attachment, textarget, texture, level);

@@ -1710,7 +1710,7 @@
 	}

 }

 

-void GL_APIENTRY glFogf(GLenum pname, GLfloat param)

+GL_API void GL_APIENTRY glFogf(GLenum pname, GLfloat param)

 {

 	TRACE("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);

 

@@ -1756,7 +1756,7 @@
 	}

 }

 

-void GL_APIENTRY glFogfv(GLenum pname, const GLfloat *params)

+GL_API void GL_APIENTRY glFogfv(GLenum pname, const GLfloat *params)

 {

 	TRACE("(GLenum pname = 0x%X, const GLfloat *params)", pname);

 

@@ -1806,17 +1806,17 @@
 	}

 }

 

-void GL_APIENTRY glFogx(GLenum pname, GLfixed param)

+GL_API void GL_APIENTRY glFogx(GLenum pname, GLfixed param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glFogxv(GLenum pname, const GLfixed *params)

+GL_API void GL_APIENTRY glFogxv(GLenum pname, const GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glFrontFace(GLenum mode)

+GL_API void GL_APIENTRY glFrontFace(GLenum mode)

 {

 	TRACE("(GLenum mode = 0x%X)", mode);

 

@@ -1838,7 +1838,7 @@
 	}

 }

 

-void GL_APIENTRY glFrustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)

+GL_API void GL_APIENTRY glFrustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)

 {

 	TRACE("(GLfloat left = %f, GLfloat right = %f, GLfloat bottom = %f, GLfloat top = %f, GLfloat zNear = %f, GLfloat zFar = %f)", left, right, bottom, top, zNear, zFar);

 

@@ -1850,12 +1850,12 @@
 	}

 }

 

-void GL_APIENTRY glFrustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar)

+GL_API void GL_APIENTRY glFrustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGenerateMipmapOES(GLenum target)

+GL_API void GL_APIENTRY glGenerateMipmapOES(GLenum target)

 {

 	TRACE("(GLenum target = 0x%X)", target);

 

@@ -1883,7 +1883,7 @@
 	}

 }

 

-void GL_APIENTRY glGenBuffers(GLsizei n, GLuint* buffers)

+GL_API void GL_APIENTRY glGenBuffers(GLsizei n, GLuint* buffers)

 {

 	TRACE("(GLsizei n = %d, GLuint* buffers = %p)", n, buffers);

 

@@ -1903,7 +1903,7 @@
 	}

 }

 

-void GL_APIENTRY glGenFramebuffersOES(GLsizei n, GLuint* framebuffers)

+GL_API void GL_APIENTRY glGenFramebuffersOES(GLsizei n, GLuint* framebuffers)

 {

 	TRACE("(GLsizei n = %d, GLuint* framebuffers = %p)", n, framebuffers);

 

@@ -1923,7 +1923,7 @@
 	}

 }

 

-void GL_APIENTRY glGenRenderbuffersOES(GLsizei n, GLuint* renderbuffers)

+GL_API void GL_APIENTRY glGenRenderbuffersOES(GLsizei n, GLuint* renderbuffers)

 {

 	TRACE("(GLsizei n = %d, GLuint* renderbuffers = %p)", n, renderbuffers);

 

@@ -1943,7 +1943,7 @@
 	}

 }

 

-void GL_APIENTRY glGenTextures(GLsizei n, GLuint* textures)

+GL_API void GL_APIENTRY glGenTextures(GLsizei n, GLuint* textures)

 {

 	TRACE("(GLsizei n = %d, GLuint* textures =  %p)", n, textures);

 

@@ -1963,7 +1963,7 @@
 	}

 }

 

-void GL_APIENTRY glGetRenderbufferParameterivOES(GLenum target, GLenum pname, GLint* params)

+GL_API void GL_APIENTRY glGetRenderbufferParameterivOES(GLenum target, GLenum pname, GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = %p)", target, pname, params);

 

@@ -2000,7 +2000,7 @@
 	}

 }

 

-void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean* params)

+GL_API void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean* params)

 {

 	TRACE("(GLenum pname = 0x%X, GLboolean* params = %p)",  pname, params);

 

@@ -2060,7 +2060,7 @@
 	}

 }

 

-void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)

+GL_API void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = %p)", target, pname, params);

 

@@ -2102,17 +2102,17 @@
 	}

 }

 

-void GL_APIENTRY glGetClipPlanef(GLenum pname, GLfloat eqn[4])

+GL_API void GL_APIENTRY glGetClipPlanef(GLenum pname, GLfloat eqn[4])

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetClipPlanex(GLenum pname, GLfixed eqn[4])

+GL_API void GL_APIENTRY glGetClipPlanex(GLenum pname, GLfixed eqn[4])

 {

 	UNIMPLEMENTED();

 }

 

-GLenum GL_APIENTRY glGetError(void)

+GL_API GLenum GL_APIENTRY glGetError(void)

 {

 	TRACE("()");

 

@@ -2126,12 +2126,12 @@
 return GL_NO_ERROR;

 }

 

-void GL_APIENTRY glGetFixedv(GLenum pname, GLfixed *params)

+GL_API void GL_APIENTRY glGetFixedv(GLenum pname, GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat* params)

+GL_API void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat* params)

 {

 	TRACE("(GLenum pname = 0x%X, GLfloat* params = %p)", pname, params);

 

@@ -2188,7 +2188,7 @@
 	}

 }

 

-void GL_APIENTRY glGetFramebufferAttachmentParameterivOES(GLenum target, GLenum attachment, GLenum pname, GLint* params)

+GL_API void GL_APIENTRY glGetFramebufferAttachmentParameterivOES(GLenum target, GLenum attachment, GLenum pname, GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint* params = %p)",

 	      target, attachment, pname, params);

@@ -2271,7 +2271,7 @@
 	}

 }

 

-void GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params)

+GL_API void GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params)

 {

 	TRACE("(GLenum pname = 0x%X, GLint* params = %p)", pname, params);

 

@@ -2335,32 +2335,32 @@
 	}

 }

 

-void GL_APIENTRY glGetLightfv(GLenum light, GLenum pname, GLfloat *params)

+GL_API void GL_APIENTRY glGetLightfv(GLenum light, GLenum pname, GLfloat *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetLightxv(GLenum light, GLenum pname, GLfixed *params)

+GL_API void GL_APIENTRY glGetLightxv(GLenum light, GLenum pname, GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)

+GL_API void GL_APIENTRY glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetMaterialxv(GLenum face, GLenum pname, GLfixed *params)

+GL_API void GL_APIENTRY glGetMaterialxv(GLenum face, GLenum pname, GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetPointerv(GLenum pname, GLvoid **params)

+GL_API void GL_APIENTRY glGetPointerv(GLenum pname, GLvoid **params)

 {

 	UNIMPLEMENTED();

 }

 

-const GLubyte* GL_APIENTRY glGetString(GLenum name)

+GL_API const GLubyte* GL_APIENTRY glGetString(GLenum name)

 {

 	TRACE("(GLenum name = 0x%X)", name);

 

@@ -2408,7 +2408,7 @@
 	}

 }

 

-void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)

+GL_API void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat* params = %p)", target, pname, params);

 

@@ -2456,7 +2456,7 @@
 	}

 }

 

-void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)

+GL_API void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = %p)", target, pname, params);

 

@@ -2504,27 +2504,27 @@
 	}

 }

 

-void GL_APIENTRY glGetTexEnvfv(GLenum env, GLenum pname, GLfloat *params)

+GL_API void GL_APIENTRY glGetTexEnvfv(GLenum env, GLenum pname, GLfloat *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetTexEnviv(GLenum env, GLenum pname, GLint *params)

+GL_API void GL_APIENTRY glGetTexEnviv(GLenum env, GLenum pname, GLint *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetTexEnvxv(GLenum env, GLenum pname, GLfixed *params)

+GL_API void GL_APIENTRY glGetTexEnvxv(GLenum env, GLenum pname, GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)

+GL_API void GL_APIENTRY glGetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glHint(GLenum target, GLenum mode)

+GL_API void GL_APIENTRY glHint(GLenum target, GLenum mode)

 {

 	TRACE("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode);

 

@@ -2553,7 +2553,7 @@
 	}

 }

 

-GLboolean GL_APIENTRY glIsBuffer(GLuint buffer)

+GL_API GLboolean GL_APIENTRY glIsBuffer(GLuint buffer)

 {

 	TRACE("(GLuint buffer = %d)", buffer);

 

@@ -2572,7 +2572,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsEnabled(GLenum cap)

+GL_API GLboolean GL_APIENTRY glIsEnabled(GLenum cap)

 {

 	TRACE("(GLenum cap = 0x%X)", cap);

 

@@ -2599,7 +2599,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsFramebufferOES(GLuint framebuffer)

+GL_API GLboolean GL_APIENTRY glIsFramebufferOES(GLuint framebuffer)

 {

 	TRACE("(GLuint framebuffer = %d)", framebuffer);

 

@@ -2618,7 +2618,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsTexture(GLuint texture)

+GL_API GLboolean GL_APIENTRY glIsTexture(GLuint texture)

 {

 	TRACE("(GLuint texture = %d)", texture);

 

@@ -2637,7 +2637,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsRenderbufferOES(GLuint renderbuffer)

+GL_API GLboolean GL_APIENTRY glIsRenderbufferOES(GLuint renderbuffer)

 {

 	TRACE("(GLuint renderbuffer = %d)", renderbuffer);

 

@@ -2656,32 +2656,32 @@
 	return GL_FALSE;

 }

 

-void GL_APIENTRY glLightModelf(GLenum pname, GLfloat param)

+GL_API void GL_APIENTRY glLightModelf(GLenum pname, GLfloat param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLightModelfv(GLenum pname, const GLfloat *params)

+GL_API void GL_APIENTRY glLightModelfv(GLenum pname, const GLfloat *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLightModelx(GLenum pname, GLfixed param)

+GL_API void GL_APIENTRY glLightModelx(GLenum pname, GLfixed param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLightModelxv(GLenum pname, const GLfixed *params)

+GL_API void GL_APIENTRY glLightModelxv(GLenum pname, const GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLightf(GLenum light, GLenum pname, GLfloat param)

+GL_API void GL_APIENTRY glLightf(GLenum light, GLenum pname, GLfloat param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat *params)

+GL_API void GL_APIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat *params)

 {

 	TRACE("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLint *params)", light, pname);

 

@@ -2714,17 +2714,17 @@
 	}

 }

 

-void GL_APIENTRY glLightx(GLenum light, GLenum pname, GLfixed param)

+GL_API void GL_APIENTRY glLightx(GLenum light, GLenum pname, GLfixed param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLightxv(GLenum light, GLenum pname, const GLfixed *params)

+GL_API void GL_APIENTRY glLightxv(GLenum light, GLenum pname, const GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLineWidth(GLfloat width)

+GL_API void GL_APIENTRY glLineWidth(GLfloat width)

 {

 	TRACE("(GLfloat width = %f)", width);

 

@@ -2741,12 +2741,12 @@
 	}

 }

 

-void GL_APIENTRY glLineWidthx(GLfixed width)

+GL_API void GL_APIENTRY glLineWidthx(GLfixed width)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLoadIdentity(void)

+GL_API void GL_APIENTRY glLoadIdentity(void)

 {

 	TRACE("()");

 

@@ -2758,7 +2758,7 @@
 	}

 }

 

-void GL_APIENTRY glLoadMatrixf(const GLfloat *m)

+GL_API void GL_APIENTRY glLoadMatrixf(const GLfloat *m)

 {

 	TRACE("(const GLfloat *m)");

 

@@ -2770,37 +2770,37 @@
 	}

 }

 

-void GL_APIENTRY glLoadMatrixx(const GLfixed *m)

+GL_API void GL_APIENTRY glLoadMatrixx(const GLfixed *m)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glLogicOp(GLenum opcode)

+GL_API void GL_APIENTRY glLogicOp(GLenum opcode)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glMaterialf(GLenum face, GLenum pname, GLfloat param)

+GL_API void GL_APIENTRY glMaterialf(GLenum face, GLenum pname, GLfloat param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)

+GL_API void GL_APIENTRY glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glMaterialx(GLenum face, GLenum pname, GLfixed param)

+GL_API void GL_APIENTRY glMaterialx(GLenum face, GLenum pname, GLfixed param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glMaterialxv(GLenum face, GLenum pname, const GLfixed *params)

+GL_API void GL_APIENTRY glMaterialxv(GLenum face, GLenum pname, const GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glMatrixMode(GLenum mode)

+GL_API void GL_APIENTRY glMatrixMode(GLenum mode)

 {

 	TRACE("(GLenum mode = 0x%X)", mode);

 

@@ -2812,7 +2812,7 @@
 	}

 }

 

-void GL_APIENTRY glMultMatrixf(const GLfloat *m)

+GL_API void GL_APIENTRY glMultMatrixf(const GLfloat *m)

 {

 	TRACE("(const GLfloat *m)");

 

@@ -2824,39 +2824,39 @@
 	}

 }

 

-void GL_APIENTRY glMultMatrixx(const GLfixed *m)

+GL_API void GL_APIENTRY glMultMatrixx(const GLfixed *m)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)

+GL_API void GL_APIENTRY glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glMultiTexCoord4x(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q)

+GL_API void GL_APIENTRY glMultiTexCoord4x(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)

+GL_API void GL_APIENTRY glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glNormal3x(GLfixed nx, GLfixed ny, GLfixed nz)

+GL_API void GL_APIENTRY glNormal3x(GLfixed nx, GLfixed ny, GLfixed nz)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)

+GL_API void GL_APIENTRY glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)

 {

 	TRACE("(GLenum type = 0x%X, GLsizei stride = %d, const GLvoid *pointer = %p)", type, stride, pointer);

 

 	glVertexAttribPointer(sw::Normal, 3, type, false, stride, pointer);

 }

 

-void GL_APIENTRY glOrthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)

+GL_API void GL_APIENTRY glOrthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)

 {

 	TRACE("(GLfloat left = %f, GLfloat right = %f, GLfloat bottom = %f, GLfloat top = %f, GLfloat zNear = %f, GLfloat zFar = %f)", left, right, bottom, top, zNear, zFar);

 

@@ -2868,12 +2868,12 @@
 	}

 }

 

-void GL_APIENTRY glOrthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar)

+GL_API void GL_APIENTRY glOrthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPixelStorei(GLenum pname, GLint param)

+GL_API void GL_APIENTRY glPixelStorei(GLenum pname, GLint param)

 {

 	TRACE("(GLenum pname = 0x%X, GLint param = %d)", pname, param);

 

@@ -2905,42 +2905,42 @@
 	}

 }

 

-void GL_APIENTRY glPointParameterf(GLenum pname, GLfloat param)

+GL_API void GL_APIENTRY glPointParameterf(GLenum pname, GLfloat param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPointParameterfv(GLenum pname, const GLfloat *params)

+GL_API void GL_APIENTRY glPointParameterfv(GLenum pname, const GLfloat *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPointParameterx(GLenum pname, GLfixed param)

+GL_API void GL_APIENTRY glPointParameterx(GLenum pname, GLfixed param)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPointParameterxv(GLenum pname, const GLfixed *params)

+GL_API void GL_APIENTRY glPointParameterxv(GLenum pname, const GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPointSize(GLfloat size)

+GL_API void GL_APIENTRY glPointSize(GLfloat size)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *pointer)

+GL_API void GL_APIENTRY glPointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *pointer)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPointSizex(GLfixed size)

+GL_API void GL_APIENTRY glPointSizex(GLfixed size)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units)

+GL_API void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units)

 {

 	TRACE("(GLfloat factor = %f, GLfloat units = %f)", factor, units);

 

@@ -2952,12 +2952,12 @@
 	}

 }

 

-void GL_APIENTRY glPolygonOffsetx(GLfixed factor, GLfixed units)

+GL_API void GL_APIENTRY glPolygonOffsetx(GLfixed factor, GLfixed units)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glPopMatrix(void)

+GL_API void GL_APIENTRY glPopMatrix(void)

 {

 	TRACE("()");

 

@@ -2969,7 +2969,7 @@
 	}

 }

 

-void GL_APIENTRY glPushMatrix(void)

+GL_API void GL_APIENTRY glPushMatrix(void)

 {

 	TRACE("()");

 

@@ -2981,7 +2981,7 @@
 	}

 }

 

-void GL_APIENTRY glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels)

+GL_API void GL_APIENTRY glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels)

 {

 	TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "

 	      "GLenum format = 0x%X, GLenum type = 0x%X, GLvoid* pixels = %p)",

@@ -3000,7 +3000,7 @@
 	}

 }

 

-void GL_APIENTRY glRenderbufferStorageOES(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)

+GL_API void GL_APIENTRY glRenderbufferStorageOES(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d)",

 	      target, internalformat, width, height);

@@ -3063,7 +3063,7 @@
 	}

 }

 

-void GL_APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)

+GL_API void GL_APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)

 {

 	TRACE("(GLfloat angle = %f, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", angle, x, y, z);

 

@@ -3075,12 +3075,12 @@
 	}

 }

 

-void GL_APIENTRY glRotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)

+GL_API void GL_APIENTRY glRotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glSampleCoverage(GLclampf value, GLboolean invert)

+GL_API void GL_APIENTRY glSampleCoverage(GLclampf value, GLboolean invert)

 {

 	TRACE("(GLclampf value = %f, GLboolean invert = %d)", value, invert);

 

@@ -3092,12 +3092,12 @@
 	}

 }

 

-void GL_APIENTRY glSampleCoveragex(GLclampx value, GLboolean invert)

+GL_API void GL_APIENTRY glSampleCoveragex(GLclampx value, GLboolean invert)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glScalef(GLfloat x, GLfloat y, GLfloat z)

+GL_API void GL_APIENTRY glScalef(GLfloat x, GLfloat y, GLfloat z)

 {

 	TRACE("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z);

 

@@ -3109,12 +3109,12 @@
 	}

 }

 

-void GL_APIENTRY glScalex(GLfixed x, GLfixed y, GLfixed z)

+GL_API void GL_APIENTRY glScalex(GLfixed x, GLfixed y, GLfixed z)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height)

+GL_API void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);

 

@@ -3131,7 +3131,7 @@
 	}

 }

 

-void GL_APIENTRY glShadeModel(GLenum mode)

+GL_API void GL_APIENTRY glShadeModel(GLenum mode)

 {

 	switch(mode)

 	{

@@ -3150,7 +3150,7 @@
 	}

 }

 

-void GL_APIENTRY glStencilFunc(GLenum func, GLint ref, GLuint mask)

+GL_API void GL_APIENTRY glStencilFunc(GLenum func, GLint ref, GLuint mask)

 {

 	TRACE("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %d)",  func, ref, mask);

 

@@ -3177,7 +3177,7 @@
 	}

 }

 

-void GL_APIENTRY glStencilMask(GLuint mask)

+GL_API void GL_APIENTRY glStencilMask(GLuint mask)

 {

 	TRACE("(GLuint mask = %d)", mask);

 

@@ -3189,7 +3189,7 @@
 	}

 }

 

-void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)

+GL_API void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)

 {

 	TRACE("(GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpas = 0x%Xs)", fail, zfail, zpass);

 

@@ -3246,7 +3246,7 @@
 	}

 }

 

-void GL_APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)

+GL_API void GL_APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)

 {

 	TRACE("(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const GLvoid *pointer = %p)", size, type, stride, pointer);

 

@@ -3260,17 +3260,17 @@
 	}

 }

 

-void GL_APIENTRY glTexEnvf(GLenum target, GLenum pname, GLfloat param)

+GL_API void GL_APIENTRY glTexEnvf(GLenum target, GLenum pname, GLfloat param)

 {

 	glTexEnvi(target, pname, (GLint)param);

 }

 

-void GL_APIENTRY glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)

+GL_API void GL_APIENTRY glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glTexEnvi(GLenum target, GLenum pname, GLint param)

+GL_API void GL_APIENTRY glTexEnvi(GLenum target, GLenum pname, GLint param)

 {

 	es1::Context *context = es1::getContext();

 

@@ -3354,23 +3354,23 @@
 	}

 }

 

-void GL_APIENTRY glTexEnvx(GLenum target, GLenum pname, GLfixed param)

+GL_API void GL_APIENTRY glTexEnvx(GLenum target, GLenum pname, GLfixed param)

 {

 	glTexEnvi(target, pname, (GLint)param);

 }

 

-void GL_APIENTRY glTexEnviv(GLenum target, GLenum pname, const GLint *params)

+GL_API void GL_APIENTRY glTexEnviv(GLenum target, GLenum pname, const GLint *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glTexEnvxv(GLenum target, GLenum pname, const GLfixed *params)

+GL_API void GL_APIENTRY glTexEnvxv(GLenum target, GLenum pname, const GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,

-                              GLint border, GLenum format, GLenum type, const GLvoid* pixels)

+GL_API void GL_APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,

+                                     GLint border, GLenum format, GLenum type, const GLvoid* pixels)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, GLsizei height = %d, "

 	      "GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const GLvoid* pixels =  %p)",

@@ -3494,7 +3494,7 @@
 	}

 }

 

-void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param)

+GL_API void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);

 

@@ -3554,12 +3554,12 @@
 	}

 }

 

-void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname, const GLfloat* params)

+GL_API void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname, const GLfloat* params)

 {

 	glTexParameterf(target, pname, *params);

 }

 

-void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)

+GL_API void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);

 

@@ -3619,7 +3619,7 @@
 	}

 }

 

-void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint* params)

+GL_API void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %p)", target, pname, params);

 

@@ -3657,18 +3657,18 @@
 	}

 }

 

-void GL_APIENTRY glTexParameterx(GLenum target, GLenum pname, GLfixed param)

+GL_API void GL_APIENTRY glTexParameterx(GLenum target, GLenum pname, GLfixed param)

 {

 	glTexParameteri(target, pname, (GLint)param);

 }

 

-void GL_APIENTRY glTexParameterxv(GLenum target, GLenum pname, const GLfixed *params)

+GL_API void GL_APIENTRY glTexParameterxv(GLenum target, GLenum pname, const GLfixed *params)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,

-                                 GLenum format, GLenum type, const GLvoid* pixels)

+GL_API void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,

+                                        GLenum format, GLenum type, const GLvoid* pixels)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 	      "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, "

@@ -3722,7 +3722,7 @@
 	}

 }

 

-void GL_APIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z)

+GL_API void GL_APIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z)

 {

 	TRACE("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z);

 

@@ -3734,19 +3734,19 @@
 	}

 }

 

-void GL_APIENTRY glTranslatex(GLfixed x, GLfixed y, GLfixed z)

+GL_API void GL_APIENTRY glTranslatex(GLfixed x, GLfixed y, GLfixed z)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)

+GL_API void GL_APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)

 {

 	TRACE("(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const GLvoid *pointer = %p)", size, type, stride, pointer);

 

 	glVertexAttribPointer(sw::Position, size, type, false, stride, pointer);

 }

 

-void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height)

+GL_API void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);

 

@@ -3763,7 +3763,7 @@
 	}

 }

 

-void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)

+GL_API void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)

 {

 	TRACE("(GLenum target = 0x%X, GLeglImageOES image = %p)", target, image);

 

@@ -3805,19 +3805,19 @@
 	}

 }

 

-void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)

+GL_API void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)

 {

 	TRACE("(GLenum target = 0x%X, GLeglImageOES image = %p)", target, image);

 

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)

+GL_API void GL_APIENTRY glDrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)

+GL_API void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)

 {

 	TRACE("(GLint x = %d, GLint y = %d, GLint z = %d, GLint width = %d, GLint height = %d)", x, y, z, width, height);

 

@@ -3834,32 +3834,32 @@
 	}

 }

 

-void GL_APIENTRY glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)

+GL_API void GL_APIENTRY glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawTexsvOES(const GLshort *coords)

+GL_API void GL_APIENTRY glDrawTexsvOES(const GLshort *coords)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawTexivOES(const GLint *coords)

+GL_API void GL_APIENTRY glDrawTexivOES(const GLint *coords)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawTexxvOES(const GLfixed *coords)

+GL_API void GL_APIENTRY glDrawTexxvOES(const GLfixed *coords)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)

+GL_API void GL_APIENTRY glDrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)

 {

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawTexfvOES(const GLfloat *coords)

+GL_API void GL_APIENTRY glDrawTexfvOES(const GLfloat *coords)

 {

 	UNIMPLEMENTED();

 }

diff --git a/src/OpenGL/libGLESv2/exports.map b/src/OpenGL/libGLESv2/exports.map
index bb81c63..27da8c6 100644
--- a/src/OpenGL/libGLESv2/exports.map
+++ b/src/OpenGL/libGLESv2/exports.map
@@ -158,19 +158,19 @@
     glReadnPixelsEXT;
     glGetnUniformfvEXT;
     glGetnUniformivEXT;
-	glGenQueriesEXT;
+    glGenQueriesEXT;
     glDeleteQueriesEXT;
     glIsQueryEXT;
     glBeginQueryEXT;
     glEndQueryEXT;
     glGetQueryivEXT;
     glGetQueryObjectuivEXT;
-	glEGLImageTargetTexture2DOES;
-	glEGLImageTargetRenderbufferStorageOES;
+    glEGLImageTargetTexture2DOES;
+    glEGLImageTargetRenderbufferStorageOES;
 
     libGLESv2_swiftshader;
 
-	Register;
+    Register;
 
 local:
     *;
diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index 9b356fd..97b6353 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -291,7 +291,7 @@
 extern "C"

 {

 

-void GL_APIENTRY glActiveTexture(GLenum texture)

+GL_APICALL void GL_APIENTRY glActiveTexture(GLenum texture)

 {

 	TRACE("(GLenum texture = 0x%X)", texture);

 

@@ -308,7 +308,7 @@
 	}

 }

 

-void GL_APIENTRY glAttachShader(GLuint program, GLuint shader)

+GL_APICALL void GL_APIENTRY glAttachShader(GLuint program, GLuint shader)

 {

 	TRACE("(GLuint program = %d, GLuint shader = %d)", program, shader);

 

@@ -350,7 +350,7 @@
 	}

 }

 

-void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint name)

+GL_APICALL void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint name)

 {

 	TRACE("(GLenum target = 0x%X, GLuint name = %d)", target, name);

 

@@ -376,7 +376,7 @@
 	}

 }

 

-void GL_APIENTRY glBindAttribLocation(GLuint program, GLuint index, const GLchar* name)

+GL_APICALL void GL_APIENTRY glBindAttribLocation(GLuint program, GLuint index, const GLchar* name)

 {

 	TRACE("(GLuint program = %d, GLuint index = %d, const GLchar* name = %s)", program, index, name);

 

@@ -412,7 +412,7 @@
 	}

 }

 

-void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer)

+GL_APICALL void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer)

 {

 	TRACE("(GLenum target = 0x%X, GLuint buffer = %d)", target, buffer);

 

@@ -478,7 +478,7 @@
 	}

 }

 

-void GL_APIENTRY glBindFramebuffer(GLenum target, GLuint framebuffer)

+GL_APICALL void GL_APIENTRY glBindFramebuffer(GLenum target, GLuint framebuffer)

 {

 	TRACE("(GLenum target = 0x%X, GLuint framebuffer = %d)", target, framebuffer);

 

@@ -503,7 +503,7 @@
 	}

 }

 

-void GL_APIENTRY glBindRenderbuffer(GLenum target, GLuint renderbuffer)

+GL_APICALL void GL_APIENTRY glBindRenderbuffer(GLenum target, GLuint renderbuffer)

 {

 	TRACE("(GLenum target = 0x%X, GLuint renderbuffer = %d)", target, renderbuffer);

 

@@ -529,7 +529,7 @@
 	}

 }

 

-void GL_APIENTRY glBindTexture(GLenum target, GLuint texture)

+GL_APICALL void GL_APIENTRY glBindTexture(GLenum target, GLuint texture)

 {

 	TRACE("(GLenum target = 0x%X, GLuint texture = %d)", target, texture);

 

@@ -577,7 +577,7 @@
 	}

 }

 

-void GL_APIENTRY glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)

+GL_APICALL void GL_APIENTRY glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)

 {

 	TRACE("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",

 		red, green, blue, alpha);

@@ -590,12 +590,12 @@
 	}

 }

 

-void GL_APIENTRY glBlendEquation(GLenum mode)

+GL_APICALL void GL_APIENTRY glBlendEquation(GLenum mode)

 {

 	glBlendEquationSeparate(mode, mode);

 }

 

-void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)

+GL_APICALL void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)

 {

 	TRACE("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);

 

@@ -631,12 +631,12 @@
 	}

 }

 

-void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor)

+GL_APICALL void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor)

 {

 	glBlendFuncSeparate(sfactor, dfactor, sfactor, dfactor);

 }

 

-void GL_APIENTRY glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)

+GL_APICALL void GL_APIENTRY glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)

 {

 	TRACE("(GLenum srcRGB = 0x%X, GLenum dstRGB = 0x%X, GLenum srcAlpha = 0x%X, GLenum dstAlpha = 0x%X)",

 	      srcRGB, dstRGB, srcAlpha, dstAlpha);

@@ -735,7 +735,7 @@
 	}

 }

 

-void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage)

+GL_APICALL void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage)

 {

 	size = static_cast<GLint>(size);   // Work around issues with some 64-bit applications

 

@@ -790,7 +790,7 @@
 	}

 }

 

-void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data)

+GL_APICALL void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data)

 {

 	size = static_cast<GLint>(size);   // Work around issues with some 64-bit applications

 	offset = static_cast<GLint>(offset);

@@ -833,7 +833,7 @@
 	}

 }

 

-GLenum GL_APIENTRY glCheckFramebufferStatus(GLenum target)

+GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatus(GLenum target)

 {

 	TRACE("(GLenum target = 0x%X)", target);

 

@@ -862,7 +862,7 @@
 	return 0;

 }

 

-void GL_APIENTRY glClear(GLbitfield mask)

+GL_APICALL void GL_APIENTRY glClear(GLbitfield mask)

 {

 	TRACE("(GLbitfield mask = %X)", mask);

 

@@ -879,7 +879,7 @@
 	}

 }

 

-void GL_APIENTRY glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)

+GL_APICALL void GL_APIENTRY glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)

 {

 	TRACE("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",

 	      red, green, blue, alpha);

@@ -892,7 +892,7 @@
 	}

 }

 

-void GL_APIENTRY glClearDepthf(GLclampf depth)

+GL_APICALL void GL_APIENTRY glClearDepthf(GLclampf depth)

 {

 	TRACE("(GLclampf depth = %f)", depth);

 

@@ -904,7 +904,7 @@
 	}

 }

 

-void GL_APIENTRY glClearStencil(GLint s)

+GL_APICALL void GL_APIENTRY glClearStencil(GLint s)

 {

 	TRACE("(GLint s = %d)", s);

 

@@ -916,7 +916,7 @@
 	}

 }

 

-void GL_APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)

+GL_APICALL void GL_APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)

 {

 	TRACE("(GLboolean red = %d, GLboolean green = %d, GLboolean blue = %d, GLboolean alpha = %d)",

 	      red, green, blue, alpha);

@@ -929,7 +929,7 @@
 	}

 }

 

-void GL_APIENTRY glCompileShader(GLuint shader)

+GL_APICALL void GL_APIENTRY glCompileShader(GLuint shader)

 {

 	TRACE("(GLuint shader = %d)", shader);

 

@@ -955,8 +955,8 @@
 	}

 }

 

-void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height,

-                                        GLint border, GLsizei imageSize, const GLvoid* data)

+GL_APICALL void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height,

+                                                   GLint border, GLsizei imageSize, const GLvoid* data)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, "

 	      "GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const GLvoid* data = %p)",

@@ -1092,8 +1092,8 @@
 	}

 }

 

-void GL_APIENTRY glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,

-                                           GLenum format, GLsizei imageSize, const GLvoid* data)

+GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,

+                                                      GLenum format, GLsizei imageSize, const GLvoid* data)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 	      "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, "

@@ -1194,7 +1194,7 @@
 	}

 }

 

-void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)

+GL_APICALL void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "

 	      "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)",

@@ -1290,7 +1290,7 @@
 	}

 }

 

-void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 	      "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",

@@ -1367,7 +1367,7 @@
 	}

 }

 

-GLuint GL_APIENTRY glCreateProgram(void)

+GL_APICALL GLuint GL_APIENTRY glCreateProgram(void)

 {

 	TRACE("()");

 

@@ -1381,7 +1381,7 @@
 	return 0;

 }

 

-GLuint GL_APIENTRY glCreateShader(GLenum type)

+GL_APICALL GLuint GL_APIENTRY glCreateShader(GLenum type)

 {

 	TRACE("(GLenum type = 0x%X)", type);

 

@@ -1402,7 +1402,7 @@
 	return 0;

 }

 

-void GL_APIENTRY glCullFace(GLenum mode)

+GL_APICALL void GL_APIENTRY glCullFace(GLenum mode)

 {

 	TRACE("(GLenum mode = 0x%X)", mode);

 

@@ -1425,7 +1425,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteBuffers(GLsizei n, const GLuint* buffers)

+GL_APICALL void GL_APIENTRY glDeleteBuffers(GLsizei n, const GLuint* buffers)

 {

 	TRACE("(GLsizei n = %d, const GLuint* buffers = %p)", n, buffers);

 

@@ -1445,7 +1445,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteFencesNV(GLsizei n, const GLuint* fences)

+GL_APICALL void GL_APIENTRY glDeleteFencesNV(GLsizei n, const GLuint* fences)

 {

 	TRACE("(GLsizei n = %d, const GLuint* fences = %p)", n, fences);

 

@@ -1465,7 +1465,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)

+GL_APICALL void GL_APIENTRY glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)

 {

 	TRACE("(GLsizei n = %d, const GLuint* framebuffers = %p)", n, framebuffers);

 

@@ -1488,7 +1488,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteProgram(GLuint program)

+GL_APICALL void GL_APIENTRY glDeleteProgram(GLuint program)

 {

 	TRACE("(GLuint program = %d)", program);

 

@@ -1517,7 +1517,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteQueriesEXT(GLsizei n, const GLuint *ids)

+GL_APICALL void GL_APIENTRY glDeleteQueriesEXT(GLsizei n, const GLuint *ids)

 {

 	TRACE("(GLsizei n = %d, const GLuint *ids = %p)", n, ids);

 

@@ -1537,7 +1537,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)

+GL_APICALL void GL_APIENTRY glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)

 {

 	TRACE("(GLsizei n = %d, const GLuint* renderbuffers = %p)", n, renderbuffers);

 

@@ -1557,7 +1557,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteShader(GLuint shader)

+GL_APICALL void GL_APIENTRY glDeleteShader(GLuint shader)

 {

 	TRACE("(GLuint shader = %d)", shader);

 

@@ -1586,7 +1586,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint* textures)

+GL_APICALL void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint* textures)

 {

 	TRACE("(GLsizei n = %d, const GLuint* textures = %p)", n, textures);

 

@@ -1609,7 +1609,7 @@
 	}

 }

 

-void GL_APIENTRY glDepthFunc(GLenum func)

+GL_APICALL void GL_APIENTRY glDepthFunc(GLenum func)

 {

 	TRACE("(GLenum func = 0x%X)", func);

 

@@ -1636,7 +1636,7 @@
 	}

 }

 

-void GL_APIENTRY glDepthMask(GLboolean flag)

+GL_APICALL void GL_APIENTRY glDepthMask(GLboolean flag)

 {

 	TRACE("(GLboolean flag = %d)", flag);

 

@@ -1648,7 +1648,7 @@
 	}

 }

 

-void GL_APIENTRY glDepthRangef(GLclampf zNear, GLclampf zFar)

+GL_APICALL void GL_APIENTRY glDepthRangef(GLclampf zNear, GLclampf zFar)

 {

 	TRACE("(GLclampf zNear = %f, GLclampf zFar = %f)", zNear, zFar);

 

@@ -1660,7 +1660,7 @@
 	}

 }

 

-void GL_APIENTRY glDetachShader(GLuint program, GLuint shader)

+GL_APICALL void GL_APIENTRY glDetachShader(GLuint program, GLuint shader)

 {

 	TRACE("(GLuint program = %d, GLuint shader = %d)", program, shader);

 

@@ -1706,7 +1706,7 @@
 	}

 }

 

-void GL_APIENTRY glDisable(GLenum cap)

+GL_APICALL void GL_APIENTRY glDisable(GLenum cap)

 {

 	TRACE("(GLenum cap = 0x%X)", cap);

 

@@ -1733,7 +1733,7 @@
 	}

 }

 

-void GL_APIENTRY glDisableVertexAttribArray(GLuint index)

+GL_APICALL void GL_APIENTRY glDisableVertexAttribArray(GLuint index)

 {

 	TRACE("(GLuint index = %d)", index);

 

@@ -1750,7 +1750,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count)

+GL_APICALL void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count)

 {

 	TRACE("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count);

 

@@ -1787,7 +1787,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices)

+GL_APICALL void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices)

 {

 	TRACE("(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const GLvoid* indices = %p)",

 	      mode, count, type, indices);

@@ -1835,7 +1835,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawArraysInstancedEXT(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)

+GL_APICALL void GL_APIENTRY glDrawArraysInstancedEXT(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)

 {

 	TRACE("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instanceCount = %d)",

 		mode, first, count, instanceCount);

@@ -1873,7 +1873,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawElementsInstancedEXT(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instanceCount)

+GL_APICALL void GL_APIENTRY glDrawElementsInstancedEXT(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instanceCount)

 {

 	TRACE("(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = %p, GLsizei instanceCount = %d)",

 		mode, count, type, indices, instanceCount);

@@ -1921,7 +1921,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribDivisorEXT(GLuint index, GLuint divisor)

+GL_APICALL void GL_APIENTRY glVertexAttribDivisorEXT(GLuint index, GLuint divisor)

 {

 	TRACE("(GLuint index = %d, GLuint divisor = %d)", index, divisor);

 

@@ -1938,7 +1938,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)

+GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)

 {

 	TRACE("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instanceCount = %d)",

 		mode, first, count, instanceCount);

@@ -1981,7 +1981,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instanceCount)

+GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instanceCount)

 {

 	TRACE("(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = %p, GLsizei instanceCount = %d)",

 		mode, count, type, indices, instanceCount);

@@ -2034,7 +2034,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribDivisorANGLE(GLuint index, GLuint divisor)

+GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE(GLuint index, GLuint divisor)

 {

 	TRACE("(GLuint index = %d, GLuint divisor = %d)", index, divisor);

 

@@ -2051,7 +2051,7 @@
 	}

 }

 

-void GL_APIENTRY glEnable(GLenum cap)

+GL_APICALL void GL_APIENTRY glEnable(GLenum cap)

 {

 	TRACE("(GLenum cap = 0x%X)", cap);

 

@@ -2078,7 +2078,7 @@
 	}

 }

 

-void GL_APIENTRY glEnableVertexAttribArray(GLuint index)

+GL_APICALL void GL_APIENTRY glEnableVertexAttribArray(GLuint index)

 {

 	TRACE("(GLuint index = %d)", index);

 

@@ -2095,7 +2095,7 @@
 	}

 }

 

-void GL_APIENTRY glEndQueryEXT(GLenum target)

+GL_APICALL void GL_APIENTRY glEndQueryEXT(GLenum target)

 {

 	TRACE("GLenum target = 0x%X)", target);

 

@@ -2116,7 +2116,7 @@
 	}

 }

 

-void GL_APIENTRY glFinishFenceNV(GLuint fence)

+GL_APICALL void GL_APIENTRY glFinishFenceNV(GLuint fence)

 {

 	TRACE("(GLuint fence = %d)", fence);

 

@@ -2135,7 +2135,7 @@
 	}

 }

 

-void GL_APIENTRY glFinish(void)

+GL_APICALL void GL_APIENTRY glFinish(void)

 {

 	TRACE("()");

 

@@ -2147,7 +2147,7 @@
 	}

 }

 

-void GL_APIENTRY glFlush(void)

+GL_APICALL void GL_APIENTRY glFlush(void)

 {

 	TRACE("()");

 

@@ -2159,7 +2159,7 @@
 	}

 }

 

-void GL_APIENTRY glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)

+GL_APICALL void GL_APIENTRY glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)

 {

 	TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, "

 	      "GLuint renderbuffer = %d)", target, attachment, renderbuffertarget, renderbuffer);

@@ -2209,7 +2209,7 @@
 	}

 }

 

-void GL_APIENTRY glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)

+GL_APICALL void GL_APIENTRY glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)

 {

 	TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "

 	      "GLuint texture = %d, GLint level = %d)", target, attachment, textarget, texture, level);

@@ -2307,7 +2307,7 @@
 	}

 }

 

-void GL_APIENTRY glFrontFace(GLenum mode)

+GL_APICALL void GL_APIENTRY glFrontFace(GLenum mode)

 {

 	TRACE("(GLenum mode = 0x%X)", mode);

 

@@ -2329,7 +2329,7 @@
 	}

 }

 

-void GL_APIENTRY glGenBuffers(GLsizei n, GLuint* buffers)

+GL_APICALL void GL_APIENTRY glGenBuffers(GLsizei n, GLuint* buffers)

 {

 	TRACE("(GLsizei n = %d, GLuint* buffers = %p)", n, buffers);

 

@@ -2349,7 +2349,7 @@
 	}

 }

 

-void GL_APIENTRY glGenerateMipmap(GLenum target)

+GL_APICALL void GL_APIENTRY glGenerateMipmap(GLenum target)

 {

 	TRACE("(GLenum target = 0x%X)", target);

 

@@ -2396,7 +2396,7 @@
 	}

 }

 

-void GL_APIENTRY glGenFencesNV(GLsizei n, GLuint* fences)

+GL_APICALL void GL_APIENTRY glGenFencesNV(GLsizei n, GLuint* fences)

 {

 	TRACE("(GLsizei n = %d, GLuint* fences = %p)", n, fences);

 

@@ -2416,7 +2416,7 @@
 	}

 }

 

-void GL_APIENTRY glGenFramebuffers(GLsizei n, GLuint* framebuffers)

+GL_APICALL void GL_APIENTRY glGenFramebuffers(GLsizei n, GLuint* framebuffers)

 {

 	TRACE("(GLsizei n = %d, GLuint* framebuffers = %p)", n, framebuffers);

 

@@ -2436,7 +2436,7 @@
 	}

 }

 

-void GL_APIENTRY glGenQueriesEXT(GLsizei n, GLuint* ids)

+GL_APICALL void GL_APIENTRY glGenQueriesEXT(GLsizei n, GLuint* ids)

 {

 	TRACE("(GLsizei n = %d, GLuint* ids = %p)", n, ids);

 

@@ -2456,7 +2456,7 @@
 	}

 }

 

-void GL_APIENTRY glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)

+GL_APICALL void GL_APIENTRY glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)

 {

 	TRACE("(GLsizei n = %d, GLuint* renderbuffers = %p)", n, renderbuffers);

 

@@ -2476,7 +2476,7 @@
 	}

 }

 

-void GL_APIENTRY glGenTextures(GLsizei n, GLuint* textures)

+GL_APICALL void GL_APIENTRY glGenTextures(GLsizei n, GLuint* textures)

 {

 	TRACE("(GLsizei n = %d, GLuint* textures = %p)", n, textures);

 

@@ -2496,7 +2496,7 @@
 	}

 }

 

-void GL_APIENTRY glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)

+GL_APICALL void GL_APIENTRY glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)

 {

 	TRACE("(GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, GLsizei *length = %p, "

 	      "GLint *size = %p, GLenum *type = %p, GLchar *name = %p)",

@@ -2534,7 +2534,7 @@
 	}

 }

 

-void GL_APIENTRY glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name)

+GL_APICALL void GL_APIENTRY glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name)

 {

 	TRACE("(GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, "

 	      "GLsizei* length = %p, GLint* size = %p, GLenum* type = %p, GLchar* name = %s)",

@@ -2572,7 +2572,7 @@
 	}

 }

 

-void GL_APIENTRY glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)

+GL_APICALL void GL_APIENTRY glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)

 {

 	TRACE("(GLuint program = %d, GLsizei maxcount = %d, GLsizei* count = %p, GLuint* shaders = %p)",

 	      program, maxcount, count, shaders);

@@ -2604,7 +2604,7 @@
 	}

 }

 

-int GL_APIENTRY glGetAttribLocation(GLuint program, const GLchar* name)

+GL_APICALL int GL_APIENTRY glGetAttribLocation(GLuint program, const GLchar* name)

 {

 	TRACE("(GLuint program = %d, const GLchar* name = %s)", program, name);

 

@@ -2638,7 +2638,7 @@
 	return -1;

 }

 

-void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean* params)

+GL_APICALL void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean* params)

 {

 	TRACE("(GLenum pname = 0x%X, GLboolean* params = %p)",  pname, params);

 

@@ -2694,7 +2694,7 @@
 	}

 }

 

-void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)

+GL_APICALL void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = %p)", target, pname, params);

 

@@ -2758,7 +2758,7 @@
 	}

 }

 

-GLenum GL_APIENTRY glGetError(void)

+GL_APICALL GLenum GL_APIENTRY glGetError(void)

 {

 	TRACE("()");

 

@@ -2772,7 +2772,7 @@
 	return GL_NO_ERROR;

 }

 

-void GL_APIENTRY glGetFenceivNV(GLuint fence, GLenum pname, GLint *params)

+GL_APICALL void GL_APIENTRY glGetFenceivNV(GLuint fence, GLenum pname, GLint *params)

 {

 	TRACE("(GLuint fence = %d, GLenum pname = 0x%X, GLint *params = %p)", fence, pname, params);

 

@@ -2791,7 +2791,7 @@
 	}

 }

 

-void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat* params)

+GL_APICALL void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat* params)

 {

 	TRACE("(GLenum pname = 0x%X, GLfloat* params = %p)", pname, params);

 

@@ -2844,7 +2844,7 @@
 	}

 }

 

-void GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)

+GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint* params = %p)",

 	      target, attachment, pname, params);

@@ -2957,14 +2957,14 @@
 	}

 }

 

-GLenum GL_APIENTRY glGetGraphicsResetStatusEXT(void)

+GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT(void)

 {

 	TRACE("()");

 

 	return GL_NO_ERROR;

 }

 

-void GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params)

+GL_APICALL void GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params)

 {

 	TRACE("(GLenum pname = 0x%X, GLint* params = %p)", pname, params);

 

@@ -3046,7 +3046,7 @@
 	}

 }

 

-void GL_APIENTRY glGetProgramiv(GLuint program, GLenum pname, GLint* params)

+GL_APICALL void GL_APIENTRY glGetProgramiv(GLuint program, GLenum pname, GLint* params)

 {

 	TRACE("(GLuint program = %d, GLenum pname = 0x%X, GLint* params = %p)", program, pname, params);

 

@@ -3096,7 +3096,7 @@
 	}

 }

 

-void GL_APIENTRY glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog)

+GL_APICALL void GL_APIENTRY glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog)

 {

 	TRACE("(GLuint program = %d, GLsizei bufsize = %d, GLsizei* length = %p, GLchar* infolog = %p)",

 	      program, bufsize, length, infolog);

@@ -3121,7 +3121,7 @@
 	}

 }

 

-void GL_APIENTRY glGetQueryivEXT(GLenum target, GLenum pname, GLint *params)

+GL_APICALL void GL_APIENTRY glGetQueryivEXT(GLenum target, GLenum pname, GLint *params)

 {

 	TRACE("GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = %p)", target, pname, params);

 

@@ -3141,7 +3141,7 @@
 	}

 }

 

-void GL_APIENTRY glGetQueryObjectuivEXT(GLuint name, GLenum pname, GLuint *params)

+GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT(GLuint name, GLenum pname, GLuint *params)

 {

 	TRACE("(GLuint name = %d, GLenum pname = 0x%X, GLuint *params = %p)", name, pname, params);

 

@@ -3184,7 +3184,7 @@
 	}

 }

 

-void GL_APIENTRY glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)

+GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = %p)", target, pname, params);

 

@@ -3222,7 +3222,7 @@
 	}

 }

 

-void GL_APIENTRY glGetShaderiv(GLuint shader, GLenum pname, GLint* params)

+GL_APICALL void GL_APIENTRY glGetShaderiv(GLuint shader, GLenum pname, GLint* params)

 {

 	TRACE("(GLuint shader = %d, GLenum pname = %d, GLint* params = %p)", shader, pname, params);

 

@@ -3260,7 +3260,7 @@
 	}

 }

 

-void GL_APIENTRY glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog)

+GL_APICALL void GL_APIENTRY glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog)

 {

 	TRACE("(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = %p, GLchar* infolog = %p)",

 	      shader, bufsize, length, infolog);

@@ -3285,7 +3285,7 @@
 	}

 }

 

-void GL_APIENTRY glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)

+GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)

 {

 	TRACE("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint* range = %p, GLint* precision = %p)",

 	      shadertype, precisiontype, range, precision);

@@ -3322,7 +3322,7 @@
 	}

 }

 

-void GL_APIENTRY glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source)

+GL_APICALL void GL_APIENTRY glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source)

 {

 	TRACE("(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = %p, GLchar* source = %p)",

 	      shader, bufsize, length, source);

@@ -3347,7 +3347,7 @@
 	}

 }

 

-const GLubyte* GL_APIENTRY glGetString(GLenum name)

+GL_APICALL const GLubyte* GL_APIENTRY glGetString(GLenum name)

 {

 	TRACE("(GLenum name = 0x%X)", name);

 

@@ -3371,7 +3371,7 @@
 	}

 }

 

-void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)

+GL_APICALL void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat* params = %p)", target, pname, params);

 

@@ -3518,7 +3518,7 @@
 	}

 }

 

-void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)

+GL_APICALL void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = %p)", target, pname, params);

 

@@ -3665,7 +3665,7 @@
 	}

 }

 

-void GL_APIENTRY glGetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSize, GLfloat* params)

+GL_APICALL void GL_APIENTRY glGetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSize, GLfloat* params)

 {

 	TRACE("(GLuint program = %d, GLint location = %d, GLsizei bufSize = %d, GLfloat* params = %p)",

 	      program, location, bufSize, params);

@@ -3698,7 +3698,7 @@
 	}

 }

 

-void GL_APIENTRY glGetUniformfv(GLuint program, GLint location, GLfloat* params)

+GL_APICALL void GL_APIENTRY glGetUniformfv(GLuint program, GLint location, GLfloat* params)

 {

 	TRACE("(GLuint program = %d, GLint location = %d, GLfloat* params = %p)", program, location, params);

 

@@ -3725,7 +3725,7 @@
 	}

 }

 

-void GL_APIENTRY glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufSize, GLint* params)

+GL_APICALL void GL_APIENTRY glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufSize, GLint* params)

 {

 	TRACE("(GLuint program = %d, GLint location = %d, GLsizei bufSize = %d, GLint* params = %p)",

 	      program, location, bufSize, params);

@@ -3763,7 +3763,7 @@
 	}

 }

 

-void GL_APIENTRY glGetUniformiv(GLuint program, GLint location, GLint* params)

+GL_APICALL void GL_APIENTRY glGetUniformiv(GLuint program, GLint location, GLint* params)

 {

 	TRACE("(GLuint program = %d, GLint location = %d, GLint* params = %p)", program, location, params);

 

@@ -3795,7 +3795,7 @@
 	}

 }

 

-int GL_APIENTRY glGetUniformLocation(GLuint program, const GLchar* name)

+GL_APICALL int GL_APIENTRY glGetUniformLocation(GLuint program, const GLchar* name)

 {

 	TRACE("(GLuint program = %d, const GLchar* name = %s)", program, name);

 

@@ -3833,7 +3833,7 @@
 	return -1;

 }

 

-void GL_APIENTRY glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)

+GL_APICALL void GL_APIENTRY glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)

 {

 	TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLfloat* params = %p)", index, pname, params);

 

@@ -3847,7 +3847,7 @@
 		}

 

 		const es2::VertexAttribute &attribState = context->getVertexAttribState(index);

-		

+

 		egl::GLint clientVersion = context->getClientVersion();

 

 		switch(pname)

@@ -3906,7 +3906,7 @@
 	}

 }

 

-void GL_APIENTRY glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)

+GL_APICALL void GL_APIENTRY glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)

 {

 	TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLint* params = %p)", index, pname, params);

 

@@ -3980,7 +3980,7 @@
 	}

 }

 

-void GL_APIENTRY glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid** pointer)

+GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid** pointer)

 {

 	TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLvoid** pointer = %p)", index, pname, pointer);

 

@@ -4002,7 +4002,7 @@
 	}

 }

 

-void GL_APIENTRY glHint(GLenum target, GLenum mode)

+GL_APICALL void GL_APIENTRY glHint(GLenum target, GLenum mode)

 {

 	TRACE("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode);

 

@@ -4030,7 +4030,7 @@
 	}

 }

 

-GLboolean GL_APIENTRY glIsBuffer(GLuint buffer)

+GL_APICALL GLboolean GL_APIENTRY glIsBuffer(GLuint buffer)

 {

 	TRACE("(GLuint buffer = %d)", buffer);

 

@@ -4049,7 +4049,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsEnabled(GLenum cap)

+GL_APICALL GLboolean GL_APIENTRY glIsEnabled(GLenum cap)

 {

 	TRACE("(GLenum cap = 0x%X)", cap);

 

@@ -4076,7 +4076,7 @@
 	return false;

 }

 

-GLboolean GL_APIENTRY glIsFenceNV(GLuint fence)

+GL_APICALL GLboolean GL_APIENTRY glIsFenceNV(GLuint fence)

 {

 	TRACE("(GLuint fence = %d)", fence);

 

@@ -4097,7 +4097,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsFramebuffer(GLuint framebuffer)

+GL_APICALL GLboolean GL_APIENTRY glIsFramebuffer(GLuint framebuffer)

 {

 	TRACE("(GLuint framebuffer = %d)", framebuffer);

 

@@ -4116,7 +4116,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsProgram(GLuint program)

+GL_APICALL GLboolean GL_APIENTRY glIsProgram(GLuint program)

 {

 	TRACE("(GLuint program = %d)", program);

 

@@ -4135,7 +4135,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsQueryEXT(GLuint name)

+GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT(GLuint name)

 {

 	TRACE("(GLuint name = %d)", name);

 

@@ -4159,7 +4159,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsRenderbuffer(GLuint renderbuffer)

+GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer(GLuint renderbuffer)

 {

 	TRACE("(GLuint renderbuffer = %d)", renderbuffer);

 

@@ -4178,7 +4178,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsShader(GLuint shader)

+GL_APICALL GLboolean GL_APIENTRY glIsShader(GLuint shader)

 {

 	TRACE("(GLuint shader = %d)", shader);

 

@@ -4197,7 +4197,7 @@
 	return GL_FALSE;

 }

 

-GLboolean GL_APIENTRY glIsTexture(GLuint texture)

+GL_APICALL GLboolean GL_APIENTRY glIsTexture(GLuint texture)

 {

 	TRACE("(GLuint texture = %d)", texture);

 

@@ -4216,7 +4216,7 @@
 	return GL_FALSE;

 }

 

-void GL_APIENTRY glLineWidth(GLfloat width)

+GL_APICALL void GL_APIENTRY glLineWidth(GLfloat width)

 {

 	TRACE("(GLfloat width = %f)", width);

 

@@ -4233,7 +4233,7 @@
 	}

 }

 

-void GL_APIENTRY glLinkProgram(GLuint program)

+GL_APICALL void GL_APIENTRY glLinkProgram(GLuint program)

 {

 	TRACE("(GLuint program = %d)", program);

 

@@ -4259,7 +4259,7 @@
 	}

 }

 

-void GL_APIENTRY glPixelStorei(GLenum pname, GLint param)

+GL_APICALL void GL_APIENTRY glPixelStorei(GLenum pname, GLint param)

 {

 	TRACE("(GLenum pname = 0x%X, GLint param = %d)", pname, param);

 

@@ -4305,7 +4305,7 @@
 	}

 }

 

-void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units)

+GL_APICALL void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units)

 {

 	TRACE("(GLfloat factor = %f, GLfloat units = %f)", factor, units);

 

@@ -4317,8 +4317,8 @@
 	}

 }

 

-void GL_APIENTRY glReadnPixelsEXT(GLint x, GLint y, GLsizei width, GLsizei height,

-                                  GLenum format, GLenum type, GLsizei bufSize, GLvoid *data)

+GL_APICALL void GL_APIENTRY glReadnPixelsEXT(GLint x, GLint y, GLsizei width, GLsizei height,

+                                             GLenum format, GLenum type, GLsizei bufSize, GLvoid *data)

 {

 	TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "

 	      "GLenum format = 0x%X, GLenum type = 0x%X, GLsizei bufSize = 0x%d, GLvoid *data = %p)",

@@ -4337,7 +4337,7 @@
 	}

 }

 

-void GL_APIENTRY glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels)

+GL_APICALL void GL_APIENTRY glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels)

 {

 	TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "

 	      "GLenum format = 0x%X, GLenum type = 0x%X, GLvoid* pixels = %p)",

@@ -4356,14 +4356,14 @@
 	}

 }

 

-void GL_APIENTRY glReleaseShaderCompiler(void)

+GL_APICALL void GL_APIENTRY glReleaseShaderCompiler(void)

 {

 	TRACE("()");

 

 	es2::Shader::releaseCompiler();

 }

 

-void GL_APIENTRY glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d)",

 	      target, samples, internalformat, width, height);

@@ -4427,12 +4427,12 @@
 	}

 }

 

-void GL_APIENTRY glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)

 {

 	glRenderbufferStorageMultisampleANGLE(target, 0, internalformat, width, height);

 }

 

-void GL_APIENTRY glSampleCoverage(GLclampf value, GLboolean invert)

+GL_APICALL void GL_APIENTRY glSampleCoverage(GLclampf value, GLboolean invert)

 {

 	TRACE("(GLclampf value = %f, GLboolean invert = %d)", value, invert);

 

@@ -4444,7 +4444,7 @@
 	}

 }

 

-void GL_APIENTRY glSetFenceNV(GLuint fence, GLenum condition)

+GL_APICALL void GL_APIENTRY glSetFenceNV(GLuint fence, GLenum condition)

 {

 	TRACE("(GLuint fence = %d, GLenum condition = 0x%X)", fence, condition);

 

@@ -4468,7 +4468,7 @@
 	}

 }

 

-void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);

 

@@ -4485,7 +4485,7 @@
 	}

 }

 

-void GL_APIENTRY glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length)

+GL_APICALL void GL_APIENTRY glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length)

 {

 	TRACE("(GLsizei n = %d, const GLuint* shaders = %p, GLenum binaryformat = 0x%X, "

 	      "const GLvoid* binary = %p, GLsizei length = %d)",

@@ -4495,7 +4495,7 @@
 	return error(GL_INVALID_ENUM);

 }

 

-void GL_APIENTRY glShaderSource(GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length)

+GL_APICALL void GL_APIENTRY glShaderSource(GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length)

 {

 	TRACE("(GLuint shader = %d, GLsizei count = %d, const GLchar** string = %p, const GLint* length = %p)",

 	      shader, count, string, length);

@@ -4527,12 +4527,12 @@
 	}

 }

 

-void GL_APIENTRY glStencilFunc(GLenum func, GLint ref, GLuint mask)

+GL_APICALL void GL_APIENTRY glStencilFunc(GLenum func, GLint ref, GLuint mask)

 {

 	glStencilFuncSeparate(GL_FRONT_AND_BACK, func, ref, mask);

 }

 

-void GL_APIENTRY glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)

+GL_APICALL void GL_APIENTRY glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)

 {

 	TRACE("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %d)", face, func, ref, mask);

 

@@ -4577,12 +4577,12 @@
 	}

 }

 

-void GL_APIENTRY glStencilMask(GLuint mask)

+GL_APICALL void GL_APIENTRY glStencilMask(GLuint mask)

 {

 	glStencilMaskSeparate(GL_FRONT_AND_BACK, mask);

 }

 

-void GL_APIENTRY glStencilMaskSeparate(GLenum face, GLuint mask)

+GL_APICALL void GL_APIENTRY glStencilMaskSeparate(GLenum face, GLuint mask)

 {

 	TRACE("(GLenum face = 0x%X, GLuint mask = %d)", face, mask);

 

@@ -4612,12 +4612,12 @@
 	}

 }

 

-void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)

+GL_APICALL void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)

 {

 	glStencilOpSeparate(GL_FRONT_AND_BACK, fail, zfail, zpass);

 }

 

-void GL_APIENTRY glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)

+GL_APICALL void GL_APIENTRY glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)

 {

 	TRACE("(GLenum face = 0x%X, GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpas = 0x%Xs)",

 	      face, fail, zfail, zpass);

@@ -4714,8 +4714,8 @@
 	return GL_TRUE;

 }

 

-void GL_APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,

-                              GLint border, GLenum format, GLenum type, const GLvoid* pixels)

+GL_APICALL void GL_APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,

+                                         GLint border, GLenum format, GLenum type, const GLvoid* pixels)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, GLsizei height = %d, "

 	      "GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const GLvoid* pixels =  %p)",

@@ -5436,7 +5436,7 @@
 	}

 }

 

-void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param)

+GL_APICALL void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);

 

@@ -5587,12 +5587,12 @@
 	}

 }

 

-void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname, const GLfloat* params)

+GL_APICALL void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname, const GLfloat* params)

 {

 	glTexParameterf(target, pname, *params);

 }

 

-void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)

+GL_APICALL void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);

 

@@ -5742,13 +5742,13 @@
 	}

 }

 

-void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint* params)

+GL_APICALL void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint* params)

 {

 	glTexParameteri(target, pname, *params);

 }

 

-void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,

-                                 GLenum format, GLenum type, const GLvoid* pixels)

+GL_APICALL void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,

+                                            GLenum format, GLenum type, const GLvoid* pixels)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 	      "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, "

@@ -5814,12 +5814,12 @@
 	}

 }

 

-void GL_APIENTRY glUniform1f(GLint location, GLfloat x)

+GL_APICALL void GL_APIENTRY glUniform1f(GLint location, GLfloat x)

 {

 	glUniform1fv(location, 1, &x);

 }

 

-void GL_APIENTRY glUniform1fv(GLint location, GLsizei count, const GLfloat* v)

+GL_APICALL void GL_APIENTRY glUniform1fv(GLint location, GLsizei count, const GLfloat* v)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = %p)", location, count, v);

 

@@ -5851,12 +5851,12 @@
 	}

 }

 

-void GL_APIENTRY glUniform1i(GLint location, GLint x)

+GL_APICALL void GL_APIENTRY glUniform1i(GLint location, GLint x)

 {

 	glUniform1iv(location, 1, &x);

 }

 

-void GL_APIENTRY glUniform1iv(GLint location, GLsizei count, const GLint* v)

+GL_APICALL void GL_APIENTRY glUniform1iv(GLint location, GLsizei count, const GLint* v)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = %p)", location, count, v);

 

@@ -5888,14 +5888,14 @@
 	}

 }

 

-void GL_APIENTRY glUniform2f(GLint location, GLfloat x, GLfloat y)

+GL_APICALL void GL_APIENTRY glUniform2f(GLint location, GLfloat x, GLfloat y)

 {

 	GLfloat xy[2] = {x, y};

 

 	glUniform2fv(location, 1, (GLfloat*)&xy);

 }

 

-void GL_APIENTRY glUniform2fv(GLint location, GLsizei count, const GLfloat* v)

+GL_APICALL void GL_APIENTRY glUniform2fv(GLint location, GLsizei count, const GLfloat* v)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = %p)", location, count, v);

 

@@ -5927,14 +5927,14 @@
 	}

 }

 

-void GL_APIENTRY glUniform2i(GLint location, GLint x, GLint y)

+GL_APICALL void GL_APIENTRY glUniform2i(GLint location, GLint x, GLint y)

 {

 	GLint xy[4] = {x, y};

 

 	glUniform2iv(location, 1, (GLint*)&xy);

 }

 

-void GL_APIENTRY glUniform2iv(GLint location, GLsizei count, const GLint* v)

+GL_APICALL void GL_APIENTRY glUniform2iv(GLint location, GLsizei count, const GLint* v)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = %p)", location, count, v);

 

@@ -5966,14 +5966,14 @@
 	}

 }

 

-void GL_APIENTRY glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)

+GL_APICALL void GL_APIENTRY glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)

 {

 	GLfloat xyz[3] = {x, y, z};

 

 	glUniform3fv(location, 1, (GLfloat*)&xyz);

 }

 

-void GL_APIENTRY glUniform3fv(GLint location, GLsizei count, const GLfloat* v)

+GL_APICALL void GL_APIENTRY glUniform3fv(GLint location, GLsizei count, const GLfloat* v)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = %p)", location, count, v);

 

@@ -6005,14 +6005,14 @@
 	}

 }

 

-void GL_APIENTRY glUniform3i(GLint location, GLint x, GLint y, GLint z)

+GL_APICALL void GL_APIENTRY glUniform3i(GLint location, GLint x, GLint y, GLint z)

 {

 	GLint xyz[3] = {x, y, z};

 

 	glUniform3iv(location, 1, (GLint*)&xyz);

 }

 

-void GL_APIENTRY glUniform3iv(GLint location, GLsizei count, const GLint* v)

+GL_APICALL void GL_APIENTRY glUniform3iv(GLint location, GLsizei count, const GLint* v)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = %p)", location, count, v);

 

@@ -6044,14 +6044,14 @@
 	}

 }

 

-void GL_APIENTRY glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+GL_APICALL void GL_APIENTRY glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

 {

 	GLfloat xyzw[4] = {x, y, z, w};

 

 	glUniform4fv(location, 1, (GLfloat*)&xyzw);

 }

 

-void GL_APIENTRY glUniform4fv(GLint location, GLsizei count, const GLfloat* v)

+GL_APICALL void GL_APIENTRY glUniform4fv(GLint location, GLsizei count, const GLfloat* v)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = %p)", location, count, v);

 

@@ -6083,14 +6083,14 @@
 	}

 }

 

-void GL_APIENTRY glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)

+GL_APICALL void GL_APIENTRY glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)

 {

 	GLint xyzw[4] = {x, y, z, w};

 

 	glUniform4iv(location, 1, (GLint*)&xyzw);

 }

 

-void GL_APIENTRY glUniform4iv(GLint location, GLsizei count, const GLint* v)

+GL_APICALL void GL_APIENTRY glUniform4iv(GLint location, GLsizei count, const GLint* v)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = %p)", location, count, v);

 

@@ -6122,7 +6122,7 @@
 	}

 }

 

-void GL_APIENTRY glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)

+GL_APICALL void GL_APIENTRY glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = %p)",

 	      location, count, transpose, value);

@@ -6155,7 +6155,7 @@
 	}

 }

 

-void GL_APIENTRY glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)

+GL_APICALL void GL_APIENTRY glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = %p)",

 	      location, count, transpose, value);

@@ -6188,7 +6188,7 @@
 	}

 }

 

-void GL_APIENTRY glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)

+GL_APICALL void GL_APIENTRY glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = %p)",

 	      location, count, transpose, value);

@@ -6221,7 +6221,7 @@
 	}

 }

 

-void GL_APIENTRY glUseProgram(GLuint program)

+GL_APICALL void GL_APIENTRY glUseProgram(GLuint program)

 {

 	TRACE("(GLuint program = %d)", program);

 

@@ -6252,7 +6252,7 @@
 	}

 }

 

-void GL_APIENTRY glValidateProgram(GLuint program)

+GL_APICALL void GL_APIENTRY glValidateProgram(GLuint program)

 {

 	TRACE("(GLuint program = %d)", program);

 

@@ -6278,7 +6278,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttrib1f(GLuint index, GLfloat x)

+GL_APICALL void GL_APIENTRY glVertexAttrib1f(GLuint index, GLfloat x)

 {

 	TRACE("(GLuint index = %d, GLfloat x = %f)", index, x);

 

@@ -6296,7 +6296,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttrib1fv(GLuint index, const GLfloat* values)

+GL_APICALL void GL_APIENTRY glVertexAttrib1fv(GLuint index, const GLfloat* values)

 {

 	TRACE("(GLuint index = %d, const GLfloat* values = %p)", index, values);

 

@@ -6314,7 +6314,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)

+GL_APICALL void GL_APIENTRY glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)

 {

 	TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f)", index, x, y);

 

@@ -6332,7 +6332,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttrib2fv(GLuint index, const GLfloat* values)

+GL_APICALL void GL_APIENTRY glVertexAttrib2fv(GLuint index, const GLfloat* values)

 {

 	TRACE("(GLuint index = %d, const GLfloat* values = %p)", index, values);

 

@@ -6350,7 +6350,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)

+GL_APICALL void GL_APIENTRY glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)

 {

 	TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);

 

@@ -6368,7 +6368,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttrib3fv(GLuint index, const GLfloat* values)

+GL_APICALL void GL_APIENTRY glVertexAttrib3fv(GLuint index, const GLfloat* values)

 {

 	TRACE("(GLuint index = %d, const GLfloat* values = %p)", index, values);

 

@@ -6386,7 +6386,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+GL_APICALL void GL_APIENTRY glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

 {

 	TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)", index, x, y, z, w);

 

@@ -6404,7 +6404,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttrib4fv(GLuint index, const GLfloat* values)

+GL_APICALL void GL_APIENTRY glVertexAttrib4fv(GLuint index, const GLfloat* values)

 {

 	TRACE("(GLuint index = %d, const GLfloat* values = %p)", index, values);

 

@@ -6421,7 +6421,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr)

+GL_APICALL void GL_APIENTRY glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr)

 {

 	TRACE("(GLuint index = %d, GLint size = %d, GLenum type = 0x%X, "

 	      "GLboolean normalized = %d, GLsizei stride = %d, const GLvoid* ptr = %p)",

@@ -6484,7 +6484,7 @@
 	}

 }

 

-void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);

 

@@ -6501,7 +6501,7 @@
 	}

 }

 

-void GL_APIENTRY glBlitFramebufferNV(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)

+GL_APICALL void GL_APIENTRY glBlitFramebufferNV(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)

 {

 	TRACE("(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, "

 	      "GLint dstX0 = %d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, "

@@ -6535,8 +6535,8 @@
 	}

 }

 

-void GL_APIENTRY glBlitFramebufferANGLE(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

-	GLbitfield mask, GLenum filter)

+GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+                                                   GLbitfield mask, GLenum filter)

 {

 	if(srcX1 - srcX0 != dstX1 - dstX0 || srcY1 - srcY0 != dstY1 - dstY0)

 	{

@@ -6547,8 +6547,8 @@
 	glBlitFramebufferNV(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);

 }

 

-void GL_APIENTRY glTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth,

-                                 GLint border, GLenum format, GLenum type, const GLvoid* pixels)

+GL_APICALL void GL_APIENTRY glTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth,

+                                            GLint border, GLenum format, GLenum type, const GLvoid* pixels)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "

 	      "GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, "

@@ -6612,7 +6612,7 @@
 	}

 }

 

-void GL_APIENTRY glTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)

+GL_APICALL void GL_APIENTRY glTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 		"GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "

@@ -6655,7 +6655,7 @@
 	}

 }

 

-void GL_APIENTRY glCopyTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 		"GLint zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",

@@ -6705,12 +6705,12 @@
 		{

 			return;

 		}

-		

+

 		texture->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, framebuffer);

 	}

 }

 

-void GL_APIENTRY glCompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)

+GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, "

 		"GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, const GLvoid* data = %p)",

@@ -6778,7 +6778,7 @@
 	}

 }

 

-void GL_APIENTRY glCompressedTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)

+GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 		"GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "

@@ -6835,7 +6835,7 @@
 	}

 }

 

-void GL_APIENTRY glFramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)

+GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)

 {

 	TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "

 		"GLuint texture = %d, GLint level = %d, GLint zoffset = %d)", target, attachment, textarget, texture, level, zoffset);

@@ -6922,7 +6922,7 @@
 	}

 }

 

-void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)

+GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)

 {

 	if(egl::getClientVersion() == 1)

 	{

@@ -6969,7 +6969,7 @@
 	}

 }

 

-void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)

+GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)

 {

 	TRACE("(GLenum target = 0x%X, GLeglImageOES image = %p)", target, image);

 

diff --git a/src/OpenGL/libGLESv2/libGLESv3.cpp b/src/OpenGL/libGLESv2/libGLESv3.cpp
index b16a969..879459e 100644
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -19,7 +19,6 @@
 #include "Texture.h"

 #include "common/debug.h"

 

-#define GL_APICALL

 #include <GLES3/gl3.h>

 #include <GLES2/gl2ext.h>

 

@@ -443,7 +442,7 @@
 extern "C"

 {

 

-void GL_APIENTRY glReadBuffer(GLenum src)

+GL_APICALL void GL_APIENTRY glReadBuffer(GLenum src)

 {

 	TRACE("(GLenum src = 0x%X)", src);

 

@@ -482,7 +481,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)

+GL_APICALL void GL_APIENTRY glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)

 {

 	TRACE("(GLenum mode = 0x%X, GLuint start = %d, GLuint end = %d, "

 		  "GLsizei count = %d, GLenum type = 0x%x, const void* indices = %p)",

@@ -525,7 +524,7 @@
 	}

 }

 

-void GL_APIENTRY glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)

+GL_APICALL void GL_APIENTRY glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "

 	      "GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, "

@@ -582,7 +581,7 @@
 	}

 }

 

-void GL_APIENTRY glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)

+GL_APICALL void GL_APIENTRY glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 		"GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "

@@ -626,7 +625,7 @@
 	}

 }

 

-void GL_APIENTRY glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 		"GLint zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",

@@ -682,7 +681,7 @@
 	}

 }

 

-void GL_APIENTRY glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)

+GL_APICALL void GL_APIENTRY glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, "

 		"GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, const GLvoid* data = %p)",

@@ -761,7 +760,7 @@
 	}

 }

 

-void GL_APIENTRY glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)

+GL_APICALL void GL_APIENTRY glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)

 {

 	TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "

 	      "GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "

@@ -829,7 +828,7 @@
 	}

 }

 

-void GL_APIENTRY glGenQueries(GLsizei n, GLuint *ids)

+GL_APICALL void GL_APIENTRY glGenQueries(GLsizei n, GLuint *ids)

 {

 	TRACE("(GLsizei n = %d, GLuint* ids = %p)", n, ids);

 

@@ -849,7 +848,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteQueries(GLsizei n, const GLuint *ids)

+GL_APICALL void GL_APIENTRY glDeleteQueries(GLsizei n, const GLuint *ids)

 {

 	TRACE("(GLsizei n = %d, GLuint* ids = %p)", n, ids);

 

@@ -869,7 +868,7 @@
 	}

 }

 

-GLboolean GL_APIENTRY glIsQuery(GLuint id)

+GL_APICALL GLboolean GL_APIENTRY glIsQuery(GLuint id)

 {

 	TRACE("(GLuint id = %d)", id);

 

@@ -893,7 +892,7 @@
 	return GL_FALSE;

 }

 

-void GL_APIENTRY glBeginQuery(GLenum target, GLuint id)

+GL_APICALL void GL_APIENTRY glBeginQuery(GLenum target, GLuint id)

 {

 	TRACE("(GLenum target = 0x%X, GLuint id = %d)", target, id);

 

@@ -915,7 +914,7 @@
 	}

 }

 

-void GL_APIENTRY glEndQuery(GLenum target)

+GL_APICALL void GL_APIENTRY glEndQuery(GLenum target)

 {

 	TRACE("(GLenum target = 0x%X)", target);

 

@@ -932,7 +931,7 @@
 	}

 }

 

-void GL_APIENTRY glGetQueryiv(GLenum target, GLenum pname, GLint *params)

+GL_APICALL void GL_APIENTRY glGetQueryiv(GLenum target, GLenum pname, GLint *params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = %p)",

 		  target, pname, params);

@@ -950,7 +949,7 @@
 	}

 }

 

-void GL_APIENTRY glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)

+GL_APICALL void GL_APIENTRY glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)

 {

 	TRACE("(GLuint id = %d, GLenum pname = 0x%X, GLint *params = %p)",

 	      id, pname, params);

@@ -994,7 +993,7 @@
 	}

 }

 

-GLboolean GL_APIENTRY glUnmapBuffer(GLenum target)

+GL_APICALL GLboolean GL_APIENTRY glUnmapBuffer(GLenum target)

 {

 	TRACE("(GLenum target = 0x%X)", target);

 

@@ -1020,7 +1019,7 @@
 	return GL_TRUE;

 }

 

-void GL_APIENTRY glGetBufferPointerv(GLenum target, GLenum pname, void **params)

+GL_APICALL void GL_APIENTRY glGetBufferPointerv(GLenum target, GLenum pname, void **params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = %p)",

 	      target, pname, params);

@@ -1050,14 +1049,14 @@
 	}

 }

 

-void GL_APIENTRY glDrawBuffers(GLsizei n, const GLenum *bufs)

+GL_APICALL void GL_APIENTRY glDrawBuffers(GLsizei n, const GLenum *bufs)

 {

 	TRACE("(GLsizei n = %d, const GLenum *bufs = %p)", n, bufs);

 

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

+GL_APICALL void GL_APIENTRY glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat *value = %p)", location, count, transpose, value);

 

@@ -1089,7 +1088,7 @@
 	}

 }

 

-void GL_APIENTRY glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

+GL_APICALL void GL_APIENTRY glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat *value = %p)", location, count, transpose, value);

 

@@ -1121,7 +1120,7 @@
 	}

 }

 

-void GL_APIENTRY glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

+GL_APICALL void GL_APIENTRY glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat *value = %p)", location, count, transpose, value);

 

@@ -1153,7 +1152,7 @@
 	}

 }

 

-void GL_APIENTRY glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

+GL_APICALL void GL_APIENTRY glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat *value = %p)", location, count, transpose, value);

 

@@ -1185,7 +1184,7 @@
 	}

 }

 

-void GL_APIENTRY glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

+GL_APICALL void GL_APIENTRY glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat *value = %p)", location, count, transpose, value);

 

@@ -1217,7 +1216,7 @@
 	}

 }

 

-void GL_APIENTRY glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

+GL_APICALL void GL_APIENTRY glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat *value = %p)", location, count, transpose, value);

 

@@ -1249,7 +1248,7 @@
 	}

 }

 

-void GL_APIENTRY glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)

+GL_APICALL void GL_APIENTRY glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)

 {

 	TRACE("(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, "

 	      "GLint dstX0 = %d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, "

@@ -1284,7 +1283,7 @@
 	}

 }

 

-void GL_APIENTRY glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d)",

 	      target, samples, internalformat, width, height);

@@ -1385,7 +1384,7 @@
 	}

 }

 

-void GL_APIENTRY glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)

+GL_APICALL void GL_APIENTRY glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)

 {

 	TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %d, GLint level = %d, GLint layer = %d)",

 	      target, attachment, texture, level, layer);

@@ -1429,7 +1428,7 @@
 	UNIMPLEMENTED();

 }

 

-void *GL_APIENTRY glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)

+GL_APICALL void *GL_APIENTRY glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)

 {

 	TRACE("(GLenum target = 0x%X,  GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = %X)",

 	      target, offset, length, access);

@@ -1472,7 +1471,7 @@
 	return nullptr;

 }

 

-void GL_APIENTRY glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)

+GL_APICALL void GL_APIENTRY glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)

 {

 	TRACE("(GLenum target = 0x%X,  GLintptr offset = %d, GLsizeiptr length = %d)",

 	      target, offset, length);

@@ -1503,7 +1502,7 @@
 	}

 }

 

-void GL_APIENTRY glBindVertexArray(GLuint array)

+GL_APICALL void GL_APIENTRY glBindVertexArray(GLuint array)

 {

 	TRACE("(GLuint array = %d)", array);

 

@@ -1520,7 +1519,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteVertexArrays(GLsizei n, const GLuint *arrays)

+GL_APICALL void GL_APIENTRY glDeleteVertexArrays(GLsizei n, const GLuint *arrays)

 {

 	TRACE("(GLsizei n = %d, const GLuint *arrays = %p)", n, arrays);

 

@@ -1540,7 +1539,7 @@
 	}

 }

 

-void GL_APIENTRY glGenVertexArrays(GLsizei n, GLuint *arrays)

+GL_APICALL void GL_APIENTRY glGenVertexArrays(GLsizei n, GLuint *arrays)

 {

 	TRACE("(GLsizei n = %d, const GLuint *arrays = %p)", n, arrays);

 

@@ -1560,7 +1559,7 @@
 	}

 }

 

-GLboolean GL_APIENTRY glIsVertexArray(GLuint array)

+GL_APICALL GLboolean GL_APIENTRY glIsVertexArray(GLuint array)

 {

 	TRACE("(GLuint array = %d)", array);

 

@@ -1584,7 +1583,7 @@
 	return GL_FALSE;

 }

 

-void GL_APIENTRY glGetIntegeri_v(GLenum target, GLuint index, GLint *data)

+GL_APICALL void GL_APIENTRY glGetIntegeri_v(GLenum target, GLuint index, GLint *data)

 {

 	TRACE("(GLenum target = 0x%X, GLuint index = %d, GLint* data = %p)",

 	      target, index, data);

@@ -1643,7 +1642,7 @@
 	}

 }

 

-void GL_APIENTRY glBeginTransformFeedback(GLenum primitiveMode)

+GL_APICALL void GL_APIENTRY glBeginTransformFeedback(GLenum primitiveMode)

 {

 	TRACE("(GLenum primitiveMode = 0x%X)", primitiveMode);

 

@@ -1678,7 +1677,7 @@
 	}

 }

 

-void GL_APIENTRY glEndTransformFeedback(void)

+GL_APICALL void GL_APIENTRY glEndTransformFeedback(void)

 {

 	TRACE("()");

 

@@ -1703,7 +1702,7 @@
 	}

 }

 

-void GL_APIENTRY glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)

+GL_APICALL void GL_APIENTRY glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)

 {

 	TRACE("(GLenum target = 0x%X, GLuint index = %d, GLuint buffer = %d, GLintptr offset = %d, GLsizeiptr size = %d)",

 	      target, index, buffer, offset, size);

@@ -1751,7 +1750,7 @@
 	}

 }

 

-void GL_APIENTRY glBindBufferBase(GLenum target, GLuint index, GLuint buffer)

+GL_APICALL void GL_APIENTRY glBindBufferBase(GLenum target, GLuint index, GLuint buffer)

 {

 	TRACE("(GLenum target = 0x%X, GLuint index = %d, GLuint buffer = %d)",

 	      target, index, buffer);

@@ -1786,7 +1785,7 @@
 	}

 }

 

-void GL_APIENTRY glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode)

+GL_APICALL void GL_APIENTRY glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode)

 {

 	TRACE("(GLuint program = %d, GLsizei count = %d, const GLchar *const*varyings = %p, GLenum bufferMode = 0x%X)",

 	      program, count, varyings, bufferMode);

@@ -1819,7 +1818,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)

+GL_APICALL void GL_APIENTRY glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)

 {

 	TRACE("(GLuint program = %d, GLuint index = %d, GLsizei bufSize = %d, GLsizei *length = %p, GLsizei *size = %p, GLenum *type = %p, GLchar *name = %p)",

 	      program, index, bufSize, length, size, type, name);

@@ -1839,7 +1838,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)

+GL_APICALL void GL_APIENTRY glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)

 {

 	TRACE("(GLuint program = %d, GLuint index = %d, GLsizei bufSize = %d, GLsizei *length = %p, GLsizei *size = %p, GLenum *type = %p, GLchar *name = %p)",

 	      index, size, type, stride, pointer);

@@ -1875,7 +1874,7 @@
 	}

 }

 

-void GL_APIENTRY glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)

+GL_APICALL void GL_APIENTRY glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)

 {

 	TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLint *params = %p)",

 	      index, pname, params);

@@ -1946,7 +1945,7 @@
 	}

 }

 

-void GL_APIENTRY glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)

+GL_APICALL void GL_APIENTRY glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)

 {

 	TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLuint *params = %p)",

 		index, pname, params);

@@ -2017,7 +2016,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)

+GL_APICALL void GL_APIENTRY glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)

 {

 	TRACE("(GLuint index = %d, GLint x = %d, GLint y = %d, GLint z = %d, GLint w = %d)",

 	      index, x, y, z, w);

@@ -2036,7 +2035,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)

+GL_APICALL void GL_APIENTRY glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)

 {

 	TRACE("(GLuint index = %d, GLint x = %d, GLint y = %d, GLint z = %d, GLint w = %d)",

 	      index, x, y, z, w);

@@ -2055,7 +2054,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribI4iv(GLuint index, const GLint *v)

+GL_APICALL void GL_APIENTRY glVertexAttribI4iv(GLuint index, const GLint *v)

 {

 	TRACE("(GLuint index = %d, GLint *v = %p)", index, v);

 

@@ -2072,7 +2071,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribI4uiv(GLuint index, const GLuint *v)

+GL_APICALL void GL_APIENTRY glVertexAttribI4uiv(GLuint index, const GLuint *v)

 {

 	TRACE("(GLuint index = %d, GLint *v = %p)", index, v);

 

@@ -2089,7 +2088,7 @@
 	}

 }

 

-void GL_APIENTRY glGetUniformuiv(GLuint program, GLint location, GLuint *params)

+GL_APICALL void GL_APIENTRY glGetUniformuiv(GLuint program, GLint location, GLuint *params)

 {

 	TRACE("(GLuint program = %d, GLint location = %d, GLuint *params = %p)",

 	      program, location, params);

@@ -2122,7 +2121,7 @@
 	}

 }

 

-GLint GL_APIENTRY glGetFragDataLocation(GLuint program, const GLchar *name)

+GL_APICALL GLint GL_APIENTRY glGetFragDataLocation(GLuint program, const GLchar *name)

 {

 	TRACE("(GLuint program = %d, const GLchar *name = %p)", program, name);

 

@@ -2159,33 +2158,33 @@
 	return -1;

 }

 

-void GL_APIENTRY glUniform1ui(GLint location, GLuint v0)

+GL_APICALL void GL_APIENTRY glUniform1ui(GLint location, GLuint v0)

 {

 	glUniform1uiv(location, 1, &v0);

 }

 

-void GL_APIENTRY glUniform2ui(GLint location, GLuint v0, GLuint v1)

+GL_APICALL void GL_APIENTRY glUniform2ui(GLint location, GLuint v0, GLuint v1)

 {

 	GLuint xy[2] = { v0, v1 };

 

 	glUniform2uiv(location, 1, (GLuint*)&xy);

 }

 

-void GL_APIENTRY glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)

+GL_APICALL void GL_APIENTRY glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)

 {

 	GLuint xyz[3] = { v0, v1, v2 };

 

 	glUniform3uiv(location, 1, (GLuint*)&xyz);

 }

 

-void GL_APIENTRY glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)

+GL_APICALL void GL_APIENTRY glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)

 {

 	GLuint xyzw[4] = { v0, v1, v2, v3 };

 

 	glUniform4uiv(location, 1, (GLuint*)&xyzw);

 }

 

-void GL_APIENTRY glUniform1uiv(GLint location, GLsizei count, const GLuint *value)

+GL_APICALL void GL_APIENTRY glUniform1uiv(GLint location, GLsizei count, const GLuint *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLuint *value = %p)",

 	      location, count, value);

@@ -2218,7 +2217,7 @@
 	}

 }

 

-void GL_APIENTRY glUniform2uiv(GLint location, GLsizei count, const GLuint *value)

+GL_APICALL void GL_APIENTRY glUniform2uiv(GLint location, GLsizei count, const GLuint *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLuint *value = %p)",

 	      location, count, value);

@@ -2251,7 +2250,7 @@
 	}

 }

 

-void GL_APIENTRY glUniform3uiv(GLint location, GLsizei count, const GLuint *value)

+GL_APICALL void GL_APIENTRY glUniform3uiv(GLint location, GLsizei count, const GLuint *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLuint *value = %p)",

 	      location, count, value);

@@ -2284,7 +2283,7 @@
 	}

 }

 

-void GL_APIENTRY glUniform4uiv(GLint location, GLsizei count, const GLuint *value)

+GL_APICALL void GL_APIENTRY glUniform4uiv(GLint location, GLsizei count, const GLuint *value)

 {

 	TRACE("(GLint location = %d, GLsizei count = %d, const GLuint *value = %p)",

 	      location, count, value);

@@ -2317,7 +2316,7 @@
 	}

 }

 

-void GL_APIENTRY glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)

+GL_APICALL void GL_APIENTRY glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)

 {

 	TRACE("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = %p)",

 	      buffer, drawbuffer, value);

@@ -2343,7 +2342,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)

+GL_APICALL void GL_APIENTRY glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)

 {

 	TRACE("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = %p)",

 	      buffer, drawbuffer, value);

@@ -2363,7 +2362,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)

+GL_APICALL void GL_APIENTRY glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)

 {

 	TRACE("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = %p)",

 	      buffer, drawbuffer, value);

@@ -2389,7 +2388,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)

+GL_APICALL void GL_APIENTRY glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)

 {

 	TRACE("(GLenum buffer = 0x%X, GLint drawbuffer = %d, GLfloat depth = %f, GLint stencil = %d)",

 	      buffer, drawbuffer, depth, stencil);

@@ -2409,7 +2408,7 @@
 	UNIMPLEMENTED();

 }

 

-const GLubyte *GL_APIENTRY glGetStringi(GLenum name, GLuint index)

+GL_APICALL const GLubyte *GL_APIENTRY glGetStringi(GLenum name, GLuint index)

 {

 	TRACE("(GLenum name = 0x%X, GLuint index = %d)", name, index);

 

@@ -2436,7 +2435,7 @@
 	return (GLubyte*)NULL;

 }

 

-void GL_APIENTRY glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)

+GL_APICALL void GL_APIENTRY glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)

 {

 	TRACE("(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X,  GLintptr readOffset = %d, GLintptr writeOffset = %d, GLsizeiptr size = %d)",

 	      readTarget, writeTarget, readOffset, writeOffset, size);

@@ -2474,7 +2473,7 @@
 	}

 }

 

-void GL_APIENTRY glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices)

+GL_APICALL void GL_APIENTRY glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices)

 {

 	TRACE("(GLuint program = %d, GLsizei uniformCount = %d, const GLchar *const*uniformNames = %p, GLuint *uniformIndices = %p)",

 	      program, uniformCount, uniformNames, uniformIndices);

@@ -2494,7 +2493,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)

+GL_APICALL void GL_APIENTRY glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)

 {

 	TRACE("(GLuint program = %d, GLsizei uniformCount = %d, const GLchar *const*uniformNames = %p, GLenum pname = 0x%X, GLuint *uniformIndices = %p)",

 	      program, uniformCount, uniformIndices, pname, uniformIndices);

@@ -2529,7 +2528,7 @@
 	UNIMPLEMENTED();

 }

 

-GLuint GL_APIENTRY glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)

+GL_APICALL GLuint GL_APIENTRY glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)

 {

 	TRACE("(GLuint program = %d, const GLchar *uniformBlockName = %p)",

 	      program, uniformBlockName);

@@ -2550,7 +2549,7 @@
 	return GL_INVALID_INDEX;

 }

 

-void GL_APIENTRY glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)

+GL_APICALL void GL_APIENTRY glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)

 {

 	TRACE("(GLuint program = %d, GLuint uniformBlockIndex = %d, GLenum pname = 0x%X, GLint *params = %p)",

 	      program, uniformBlockIndex, pname, params);

@@ -2584,7 +2583,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)

+GL_APICALL void GL_APIENTRY glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)

 {

 	TRACE("(GLuint program = %d, GLuint uniformBlockIndex = %d, GLsizei bufSize = %d, GLsizei *length = %p, GLchar *uniformBlockName = %p)",

 	      program, uniformBlockIndex, bufSize, length, uniformBlockName);

@@ -2604,7 +2603,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)

+GL_APICALL void GL_APIENTRY glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)

 {

 	TRACE("(GLuint program = %d, GLuint uniformBlockIndex = %d, GLuint uniformBlockBinding = %d)",

 	      program, uniformBlockIndex, uniformBlockBinding);

@@ -2624,7 +2623,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)

+GL_APICALL void GL_APIENTRY glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)

 {

 	TRACE("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instanceCount = %d)",

 	      mode, first, count, instanceCount);

@@ -2662,7 +2661,7 @@
 	}

 }

 

-void GL_APIENTRY glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instanceCount)

+GL_APICALL void GL_APIENTRY glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instanceCount)

 {

 	TRACE("(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = %p, GLsizei instanceCount = %d)",

 	      mode, count, type, indices, instanceCount);

@@ -2710,7 +2709,7 @@
 	}

 }

 

-GLsync GL_APIENTRY glFenceSync(GLenum condition, GLbitfield flags)

+GL_APICALL GLsync GL_APIENTRY glFenceSync(GLenum condition, GLbitfield flags)

 {

 	TRACE("(GLenum condition = 0x%X, GLbitfield flags = %X)", condition, flags);

 

@@ -2731,7 +2730,7 @@
 	return nullptr;

 }

 

-GLboolean GL_APIENTRY glIsSync(GLsync sync)

+GL_APICALL GLboolean GL_APIENTRY glIsSync(GLsync sync)

 {

 	TRACE("(GLsync sync = %p)", sync);

 

@@ -2739,14 +2738,14 @@
 	return GL_FALSE;

 }

 

-void GL_APIENTRY glDeleteSync(GLsync sync)

+GL_APICALL void GL_APIENTRY glDeleteSync(GLsync sync)

 {

 	TRACE("(GLsync sync = %p)", sync);

 

 	UNIMPLEMENTED();

 }

 

-GLenum GL_APIENTRY glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)

+GL_APICALL GLenum GL_APIENTRY glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)

 {

 	TRACE("(GLsync sync = %p, GLbitfield flags = %X, GLuint64 timeout = %llu)", sync, flags, timeout);

 

@@ -2759,7 +2758,7 @@
 	return GL_FALSE;

 }

 

-void GL_APIENTRY glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)

+GL_APICALL void GL_APIENTRY glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)

 {

 	TRACE("(GLsync sync = %p, GLbitfield flags = %X, GLuint64 timeout = %llu)", sync, flags, timeout);

 

@@ -2776,13 +2775,13 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetInteger64v(GLenum pname, GLint64 *data)

+GL_APICALL void GL_APIENTRY glGetInteger64v(GLenum pname, GLint64 *data)

 {

 	TRACE("(GLenum pname = 0x%X, GLint64 *data = %p)", pname, data);

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)

+GL_APICALL void GL_APIENTRY glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)

 {

 	TRACE("(GLsync sync = %p, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = %p, GLint *values = %p)",

 	      sync, pname, bufSize, length, values);

@@ -2790,13 +2789,13 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)

+GL_APICALL void GL_APIENTRY glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)

 {

 	TRACE("(GLenum target = 0x%X, GLuint index = %d, GLint64 *data = %p)", target, index, data);

 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)

+GL_APICALL void GL_APIENTRY glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = %p)", target, pname, params);

 

@@ -2868,7 +2867,7 @@
 	}

 }

 

-void GL_APIENTRY glGenSamplers(GLsizei count, GLuint *samplers)

+GL_APICALL void GL_APIENTRY glGenSamplers(GLsizei count, GLuint *samplers)

 {

 	TRACE("(GLsizei count = %d, GLuint *samplers = %p)", count, samplers);

 

@@ -2888,7 +2887,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteSamplers(GLsizei count, const GLuint *samplers)

+GL_APICALL void GL_APIENTRY glDeleteSamplers(GLsizei count, const GLuint *samplers)

 {

 	TRACE("(GLsizei count = %d, GLuint *samplers = %p)", count, samplers);

 

@@ -2908,7 +2907,7 @@
 	}

 }

 

-GLboolean GL_APIENTRY glIsSampler(GLuint sampler)

+GL_APICALL GLboolean GL_APIENTRY glIsSampler(GLuint sampler)

 {

 	TRACE("(GLuint sampler = %d)", sampler);

 

@@ -2932,7 +2931,7 @@
 	return GL_FALSE;

 }

 

-void GL_APIENTRY glBindSampler(GLuint unit, GLuint sampler)

+GL_APICALL void GL_APIENTRY glBindSampler(GLuint unit, GLuint sampler)

 {

 	TRACE("(GLuint unit = %d, GLuint sampler = %d)", unit, sampler);

 

@@ -2959,7 +2958,7 @@
 	}

 }

 

-void GL_APIENTRY glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)

+GL_APICALL void GL_APIENTRY glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)

 {

 	TRACE("(GLuint sampler = %d, GLenum pname = 0x%X, GLint param = %d)",

 	      sampler, pname, param);

@@ -2967,7 +2966,7 @@
 	glSamplerParameteriv(sampler, pname, &param);

 }

 

-void GL_APIENTRY glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)

+GL_APICALL void GL_APIENTRY glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)

 {

 	TRACE("(GLuint sampler = %d, GLenum pname = 0x%X, const GLint *param = %p)",

 	      sampler, pname, param);

@@ -3087,7 +3086,7 @@
 	}

 }

 

-void GL_APIENTRY glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)

+GL_APICALL void GL_APIENTRY glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)

 {

 	TRACE("(GLuint sampler = %d, GLenum pname = 0x%X, GLfloat param = %f)",

 	      sampler, pname, param);

@@ -3095,7 +3094,7 @@
 	glSamplerParameterfv(sampler, pname, &param);

 }

 

-void GL_APIENTRY glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)

+GL_APICALL void GL_APIENTRY glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)

 {

 	TRACE("(GLuint sampler = %d, GLenum pname = 0x%X, const GLfloat *param = %p)",

 	      sampler, pname, param);

@@ -3215,7 +3214,7 @@
 	}

 }

 

-void GL_APIENTRY glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)

+GL_APICALL void GL_APIENTRY glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)

 {

 	TRACE("(GLuint sampler = %d, GLenum pname = 0x%X, GLint *params = %p)",

 	      sampler, pname, params);

@@ -3266,7 +3265,7 @@
 	}

 }

 

-void GL_APIENTRY glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)

+GL_APICALL void GL_APIENTRY glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)

 {

 	TRACE("(GLuint sampler = %d, GLenum pname = 0x%X, GLfloat *params = %p)",

 	      sampler, pname, params);

@@ -3317,7 +3316,7 @@
 	}

 }

 

-void GL_APIENTRY glVertexAttribDivisor(GLuint index, GLuint divisor)

+GL_APICALL void GL_APIENTRY glVertexAttribDivisor(GLuint index, GLuint divisor)

 {

 	TRACE("(GLuint index = %d, GLuint divisor = %d)", index, divisor);

 

@@ -3334,7 +3333,7 @@
 	}

 }

 

-void GL_APIENTRY glBindTransformFeedback(GLenum target, GLuint id)

+GL_APICALL void GL_APIENTRY glBindTransformFeedback(GLenum target, GLuint id)

 {

 	TRACE("(GLenum target = 0x%X, GLuint id = %d)", target, id);

 

@@ -3361,7 +3360,7 @@
 	}

 }

 

-void GL_APIENTRY glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)

+GL_APICALL void GL_APIENTRY glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)

 {

 	TRACE("(GLsizei n = %d, const GLuint *ids = %p)", n, ids);

 

@@ -3384,7 +3383,7 @@
 	}

 }

 

-void GL_APIENTRY glGenTransformFeedbacks(GLsizei n, GLuint *ids)

+GL_APICALL void GL_APIENTRY glGenTransformFeedbacks(GLsizei n, GLuint *ids)

 {

 	TRACE("(GLsizei n = %d, const GLuint *ids = %p)", n, ids);

 

@@ -3404,7 +3403,7 @@
 	}

 }

 

-GLboolean GL_APIENTRY glIsTransformFeedback(GLuint id)

+GL_APICALL GLboolean GL_APIENTRY glIsTransformFeedback(GLuint id)

 {

 	TRACE("(GLuint id = %d)", id);

 

@@ -3428,7 +3427,7 @@
 	return GL_FALSE;

 }

 

-void GL_APIENTRY glPauseTransformFeedback(void)

+GL_APICALL void GL_APIENTRY glPauseTransformFeedback(void)

 {

 	TRACE("()");

 

@@ -3449,7 +3448,7 @@
 	}

 }

 

-void GL_APIENTRY glResumeTransformFeedback(void)

+GL_APICALL void GL_APIENTRY glResumeTransformFeedback(void)

 {

 	TRACE("()");

 

@@ -3470,7 +3469,7 @@
 	}

 }

 

-void GL_APIENTRY glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary)

+GL_APICALL void GL_APIENTRY glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary)

 {

 	TRACE("(GLuint program = %d, GLsizei bufSize = %d, GLsizei *length = %p, GLenum *binaryFormat = %p, void *binary = %p)",

 	      program, bufSize, length, binaryFormat, binary);

@@ -3478,7 +3477,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glProgramBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length)

+GL_APICALL void GL_APIENTRY glProgramBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length)

 {

 	TRACE("(GLuint program = %d, GLenum binaryFormat = 0x%X, const void *binary = %p, GLsizei length = %d)",

 	      program, binaryFormat, binaryFormat, length);

@@ -3486,7 +3485,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glProgramParameteri(GLuint program, GLenum pname, GLint value)

+GL_APICALL void GL_APIENTRY glProgramParameteri(GLuint program, GLenum pname, GLint value)

 {

 	TRACE("(GLuint program = %d, GLenum pname = 0x%X, GLint value = %d)",

 	      program, pname, value);

@@ -3494,7 +3493,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)

+GL_APICALL void GL_APIENTRY glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)

 {

 	TRACE("(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = %p)",

 	      target, numAttachments, attachments);

@@ -3502,7 +3501,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = %p, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",

 	      target, numAttachments, attachments, x, y, width, height);

@@ -3510,7 +3509,7 @@
 	UNIMPLEMENTED();

 }

 

-void GL_APIENTRY glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)

+GL_APICALL void GL_APIENTRY glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)

 {

 	TRACE("(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d)",

 	      target, levels, internalformat, width, height);

@@ -3580,7 +3579,7 @@
 	}

 }

 

-void GL_APIENTRY glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)

+GL_APICALL void GL_APIENTRY glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)

 {

 	TRACE("(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d)",

 	      target, levels, internalformat, width, height, depth);

@@ -3656,7 +3655,7 @@
 	}

 }

 

-void GL_APIENTRY glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)

+GL_APICALL void GL_APIENTRY glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)

 {

 	TRACE("(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLint *params = %p)",

 	      target, internalformat, pname, bufSize, params);