From ff2ef131b40ecf0aa894f0d6ff89468403af9306 Mon Sep 17 00:00:00 2001 From: fayjf Date: Thu, 19 Nov 2009 12:51:58 +0000 Subject: [PATCH] Making the "smooth_opengl3" typedefs to be Windows only per a discussion on the developers' list over the last several days. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@851 7f0cb862-5218-0410-a997-914c9d46530a --- .../demos/smooth_opengl3/smooth_opengl3.c | 61 +++++++------------ 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c b/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c index d72cf65..a36f090 100755 --- a/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c +++ b/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c @@ -93,67 +93,52 @@ void checkError(const char *functionName) typedef ptrdiff_t ourGLsizeiptr; typedef char ourGLchar; - + +#if defined(WIN32) #ifndef APIENTRY #define APIENTRY #endif typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); -PFNGLGENBUFFERSPROC gl_GenBuffers; - typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -PFNGLBINDBUFFERPROC gl_BindBuffer; - typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); -PFNGLBUFFERDATAPROC gl_BufferData; - typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type); -PFNGLCREATESHADERPROC gl_CreateShader; - typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length); -PFNGLSHADERSOURCEPROC gl_ShaderSource; - typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader); -PFNGLCOMPILESHADERPROC gl_CompileShader; - typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void); -PFNGLCREATEPROGRAMPROC gl_CreateProgram; - typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -PFNGLATTACHSHADERPROC gl_AttachShader; - typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program); -PFNGLLINKPROGRAMPROC gl_LinkProgram; - typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program); -PFNGLUSEPROGRAMPROC gl_UseProgram; - typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); -PFNGLGETSHADERIVPROC gl_GetShaderiv; - typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); -PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; - typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); -PFNGLGETPROGRAMIVPROC gl_GetProgramiv; - typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); -PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; - typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name); -PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation; - typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer; - typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray; - typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); -PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; - typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv; +#endif /* defined(WIN32) */ + +PFNGLGENBUFFERSPROC gl_GenBuffers; +PFNGLBINDBUFFERPROC gl_BindBuffer; +PFNGLBUFFERDATAPROC gl_BufferData; +PFNGLCREATESHADERPROC gl_CreateShader; +PFNGLSHADERSOURCEPROC gl_ShaderSource; +PFNGLCOMPILESHADERPROC gl_CompileShader; +PFNGLCREATEPROGRAMPROC gl_CreateProgram; +PFNGLATTACHSHADERPROC gl_AttachShader; +PFNGLLINKPROGRAMPROC gl_LinkProgram; +PFNGLUSEPROGRAMPROC gl_UseProgram; +PFNGLGETSHADERIVPROC gl_GetShaderiv; +PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; +PFNGLGETPROGRAMIVPROC gl_GetProgramiv; +PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; +PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation; +PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer; +PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray; +PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; +PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv; void initExtensionEntries(void) {