Direct linking of glGetString and glGetIntegerv is necessary for Windows/WGL

This commit is contained in:
Nigel Stewart 2016-04-02 13:19:57 +10:00
parent 8042db9fa3
commit f1a40e2fea

View File

@ -81,11 +81,15 @@ static GLenum GLEWAPIENTRY glewContextInit ()
GLint major, minor; GLint major, minor;
size_t n; size_t n;
/* query opengl version */ #ifdef _WIN32
getString = glGetString;
#else
getString = (PFNGLGETSTRINGPROC) glewGetProcAddress((const GLubyte*)"glGetString"); getString = (PFNGLGETSTRINGPROC) glewGetProcAddress((const GLubyte*)"glGetString");
if (!getString) if (!getString)
return GLEW_ERROR_NO_GL_VERSION; return GLEW_ERROR_NO_GL_VERSION;
#endif
/* query opengl version */
s = getString(GL_VERSION); s = getString(GL_VERSION);
dot = _glewStrCLen(s, '.'); dot = _glewStrCLen(s, '.');
if (dot == 0) if (dot == 0)
@ -137,7 +141,12 @@ static GLenum GLEWAPIENTRY glewContextInit ()
const char *ext; const char *ext;
GLboolean *enable; GLboolean *enable;
#ifdef _WIN32
getIntegerv = glGetIntegerv;
#else
getIntegerv = (PFNGLGETINTEGERVPROC) glewGetProcAddress((const GLubyte*)"glGetIntegerv"); getIntegerv = (PFNGLGETINTEGERVPROC) glewGetProcAddress((const GLubyte*)"glGetIntegerv");
#endif
if (getIntegerv) if (getIntegerv)
getIntegerv(GL_NUM_EXTENSIONS, &n); getIntegerv(GL_NUM_EXTENSIONS, &n);