Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed client API version parsing.

Browse Source
This commit is contained in:
Camilla Berglund 2012-07-31 19:06:48 +02:00
parent 0b25bba5b5
commit b1de4d6fed
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/opengl.c
View File

@ -41,8 +41,15 @@
static GLboolean parseGLVersion(int* major, int* minor, int* rev)
{
GLuint _major, _minor = 0, _rev = 0;
int i, _major, _minor = 0, _rev = 0;
const char* version;
const char* prefixes[] =
{
"OpenGL ES-CM ",
"OpenGL ES-CL ",
"OpenGL ES ",
NULL
};
version = (const char*) glGetString(GL_VERSION);
if (!version)
@ -52,19 +59,22 @@ static GLboolean parseGLVersion(int* major, int* minor, int* rev)
return GL_FALSE;
}
for (;;)
for (i = 0; prefixes[i]; i++)
{
if (*version != '\0')
{
_glfwSetError(GLFW_PLATFORM_ERROR,
"X11/EGL: No version found in version string");
return GL_FALSE;
}
const size_t length = strlen(prefixes[i]);
if (sscanf(version, "%d.%d.%d", &_major, &_minor, &_rev))
break;
if (strncmp(version, prefixes[i], length) == 0)
{
version += length;
break;
}
}
version++;
if (!sscanf(version, "%d.%d.%d", &_major, &_minor, &_rev))
{
_glfwSetError(GLFW_PLATFORM_ERROR,
"X11/EGL: No version found in version string");
return GL_FALSE;
}
*major = _major;