[CoreSupport] Linux/GLX touch-ups for GL 3.0 + extension detection, GLX.

This commit is contained in:
Nigel Stewart 2015-02-22 00:37:29 +10:00 committed by Nigel Stewart
parent 512392f570
commit 0f3a888f61
2 changed files with 9 additions and 5 deletions

View File

@ -42,10 +42,15 @@ if (@ARGV)
#my $pextvar = prefix_varname($extvar); #my $pextvar = prefix_varname($extvar);
print "#ifdef $extname\n";
if (length($extstring) && $extstring !~ /^GL_/)
{
print " " . $extvar . " = _glewSearchExtension(\"$extstring\", extStart, extEnd);\n";
}
if (keys %$functions) if (keys %$functions)
{ {
print "#ifdef $extname\n";
if ($extname =~ /WGL_.*/) if ($extname =~ /WGL_.*/)
{ {
print " if (glewExperimental || " . $extvar . "|| crippled) " . $extvar . "= !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n"; print " if (glewExperimental || " . $extvar . "|| crippled) " . $extvar . "= !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n";
@ -54,9 +59,8 @@ if (@ARGV)
{ {
print " if (glewExperimental || " . $extvar . ") " . $extvar . " = !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n"; print " if (glewExperimental || " . $extvar . ") " . $extvar . " = !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n";
} }
print "#endif /* $extname */\n";
} }
print "#endif /* $extname */\n";
} }
} }

View File

@ -122,7 +122,7 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
/* glGetStringi is OpenGL 3.0 */ /* glGetStringi is OpenGL 3.0 */
getStringi = (PFNGLGETSTRINGIPROC) glewGetProcAddress((const GLubyte*)"glGetStringi"); getStringi = (PFNGLGETSTRINGIPROC) glewGetProcAddress((const GLubyte*)"glGetStringi");
if (glGetStringi) if (getStringi)
for (i = 0; i<n; ++i) for (i = 0; i<n; ++i)
{ {
ext = (const char *) getStringi(GL_EXTENSIONS, i); ext = (const char *) getStringi(GL_EXTENSIONS, i);