From 63e3b825580c8fbf6b84d441c92ed39348e51c17 Mon Sep 17 00:00:00 2001
From: Jon Bergli Heier <snakebite@jvnv.net>
Date: Wed, 11 May 2011 19:30:31 +0200
Subject: Working win32 port.

---
 gl.h | 55 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'gl.h')

diff --git a/gl.h b/gl.h
index 1d3a151..1bbd9a5 100644
--- a/gl.h
+++ b/gl.h
@@ -9,39 +9,40 @@
 
 #ifdef WIN32
 /* buffer */
-extern void (*glGenBuffers)(GLsizei, GLuint*);
-extern void (*glDeleteBuffers)(GLsizei, GLuint*);
-extern void (*glBindBuffer)(GLenum, GLuint);
-extern void (*glBufferData)(GLenum, GLsizeiptr, const GLvoid*, GLenum);
-extern GLvoid* (*glMapBuffer)(GLenum, GLenum);
-extern GLboolean (*glUnmapBuffer)(GLenum);
+extern void (APIENTRY *glGenBuffers)(GLsizei, GLuint*);
+extern void (APIENTRY *glDeleteBuffers)(GLsizei, GLuint*);
+extern void (APIENTRY *glBindBuffer)(GLenum, GLuint);
+extern void (APIENTRY *glBufferData)(GLenum, GLsizeiptr, const GLvoid*, GLenum);
+extern GLvoid* (APIENTRY *glMapBuffer)(GLenum, GLenum);
+extern GLboolean (APIENTRY *glUnmapBuffer)(GLenum);
 
 /* uniform */
-extern GLint (*glGetUniformLocation)(GLuint, const GLchar*);
-extern void (*glUniform1i)(GLint, GLint);
-extern void (*glUniform2f)(GLint, GLfloat, GLfloat);
-extern void (*glUniform3f)(GLint, GLfloat, GLfloat, GLfloat);
+extern GLint (APIENTRY *glGetUniformLocation)(GLuint, const GLchar*);
+extern void (APIENTRY *glUniform1i)(GLint, GLint);
+extern void (APIENTRY *glUniform2f)(GLint, GLfloat, GLfloat);
+extern void (APIENTRY *glUniform3f)(GLint, GLfloat, GLfloat, GLfloat);
+extern void (APIENTRY *glUniform1iv)(GLint, GLsizei, const GLint*);
 
 /* texture */
-extern void (*glActiveTexture)(GLenum);
+extern void (APIENTRY *glActiveTexture)(GLenum);
 
 /* program/shader */
-extern GLuint (*glCreateProgram)(void);
-extern void (*glLinkProgram)(GLuint);
-extern void (*glGetProgramiv)(GLuint, GLenum, GLint*);
-extern void (*glGetProgramInfoLog)(GLuint, GLsizei, GLsizei*, GLchar*);
-extern void (*glUseProgram)(GLuint);
-extern void (*glDeleteProgram)(GLuint);
-
-extern GLuint (*glCreateShader)(GLenum);
-extern void (*glShaderSource)(GLuint, GLsizei, const GLchar**, const GLint*);
-extern void (*glCompileShader)(GLuint);
-extern void (*glGetShaderiv)(GLuint, GLenum, GLint*);
-extern void (*glGetShaderInfoLog)(GLuint, GLsizei, GLsizei*, GLchar*);
-
-extern void (*glAttachShader)(GLuint, GLuint);
-extern void (*glDetachShader)(GLuint, GLuint);
-extern void (*glDeleteShader)(GLuint);
+extern GLuint (APIENTRY *glCreateProgram)(void);
+extern void (APIENTRY *glLinkProgram)(GLuint);
+extern void (APIENTRY *glGetProgramiv)(GLuint, GLenum, GLint*);
+extern void (APIENTRY *glGetProgramInfoLog)(GLuint, GLsizei, GLsizei*, GLchar*);
+extern void (APIENTRY *glUseProgram)(GLuint);
+extern void (APIENTRY *glDeleteProgram)(GLuint);
+
+extern GLuint (APIENTRY *glCreateShader)(GLenum);
+extern void (APIENTRY *glShaderSource)(GLuint, GLsizei, const GLchar**, const GLint*);
+extern void (APIENTRY *glCompileShader)(GLuint);
+extern void (APIENTRY *glGetShaderiv)(GLuint, GLenum, GLint*);
+extern void (APIENTRY *glGetShaderInfoLog)(GLuint, GLsizei, GLsizei*, GLchar*);
+
+extern void (APIENTRY *glAttachShader)(GLuint, GLuint);
+extern void (APIENTRY *glDetachShader)(GLuint, GLuint);
+extern void (APIENTRY *glDeleteShader)(GLuint);
 
 void win32_gl_init();
 #endif
-- 
cgit v1.2.3