Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-12-27 16:07:11 +01:00
commit 83f43657ad
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -1567,11 +1567,20 @@ void registerGlExtensions(CGlExtensions &ext)
// OpenGL 1.2 ?? // OpenGL 1.2 ??
const char *nglVersion = (const char *)glGetString (GL_VERSION); const char *nglVersion = (const char *)glGetString (GL_VERSION);
if (nglVersion)
{
sint a = 0, b = 0; sint a = 0, b = 0;
// 1.2*** ??? // 1.2*** ???
sscanf(nglVersion, "%d.%d", &a, &b); sscanf(nglVersion, "%d.%d", &a, &b);
ext.Version1_2 = (a==1 && b>=2) || (a>=2); ext.Version1_2 = (a==1 && b>=2) || (a>=2);
}
else
{
nlwarning("3D: Unable to get GL_VERSION, OpenGL 1.2 should be supported on all recent GPU...");
ext.Version1_2 = true;
}
const char *vendor = (const char *) glGetString (GL_VENDOR); const char *vendor = (const char *) glGetString (GL_VENDOR);
const char *renderer = (const char *) glGetString (GL_RENDERER); const char *renderer = (const char *) glGetString (GL_RENDERER);