From 3f0b3eebae5d998d57871656e2b80e68d4744f68 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Wed, 25 Apr 2007 18:45:09 +0000 Subject: [PATCH] Another attempt to fix gl_wrap.cpp on OS X. Originally committed to SVN as r1143. --- aegisub/gl_wrap.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aegisub/gl_wrap.cpp b/aegisub/gl_wrap.cpp index 78c1afa36..36215e133 100644 --- a/aegisub/gl_wrap.cpp +++ b/aegisub/gl_wrap.cpp @@ -64,6 +64,7 @@ void* glGetProc(const char *str) { return aglGetProcAddress(str); } ////////////////////////////////////// // OpenGL extension function pointers +#ifndef __WXMAC_OSX__ PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = NULL; PFNGLDELETEOBJECTARBPROC glDeleteObjectARB = NULL; PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB = NULL; @@ -75,6 +76,7 @@ PFNGLCOMPILESHADERARBPROC glCompileShaderARB = NULL; PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB = NULL; PFNGLUNIFORM1IARBPROC glUniform1iARB = NULL; PFNGLUNIFORM2FARBPROC glUniform2fARB = NULL; +#endif //////////////// @@ -305,6 +307,7 @@ void OpenGLWrapper::Initialize() { if (!initialized) { initialized = true; +#ifndef __WXMAC_OSX__ glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC) glGetProc("glUseProgramObjectARB"); if (!glUseProgramObjectARB) throw _T("OpenGL shader support not available."); glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC) glGetProc("glDeleteObjectARB"); @@ -317,6 +320,7 @@ void OpenGLWrapper::Initialize() { glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC) glGetProc("glGetUniformLocationARB"); glUniform1iARB = (PFNGLUNIFORM1IARBPROC) glGetProc("glUniform1iARB"); glUniform2fARB = (PFNGLUNIFORM2FARBPROC) glGetProc("glUniform2fARB"); +#endif } }