Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-17 22:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed extension retrieval for OpenGL ES 3+.

Browse Source
This commit is contained in:
Camilla Berglund
2015-01-06 20:21:00 +01:00
parent 6c7509c942
commit d311e28038
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/context.c
+16 -17
View File
@@ -588,7 +588,6 @@ GLFWAPI void glfwSwapInterval(int interval)
GLFWAPI int glfwExtensionSupported(const char* extension)
{
const GLubyte* extensions;
_GLFWwindow* window;
_GLFW_REQUIRE_INIT_OR_RETURN(GL_FALSE);
@@ -606,23 +605,8 @@ GLFWAPI int glfwExtensionSupported(const char* extension)
return GL_FALSE;
}
if (window->context.major < 3)
{
// Check if extension is in the old style OpenGL extensions string
extensions = glGetString(GL_EXTENSIONS);
if (!extensions)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"Failed to retrieve extension string");
return GL_FALSE;
}
if (_glfwStringInExtensionString(extension, extensions))
return GL_TRUE;
}
#if defined(_GLFW_USE_OPENGL)
else
if (window->context.major >= 3)
{
int i;
GLint count;
@@ -645,7 +629,22 @@ GLFWAPI int glfwExtensionSupported(const char* extension)
return GL_TRUE;
}
}
else
#endif // _GLFW_USE_OPENGL
{
// Check if extension is in the old style OpenGL extensions string
const GLubyte* extensions = glGetString(GL_EXTENSIONS);
if (!extensions)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"Failed to retrieve extension string");
return GL_FALSE;
}
if (_glfwStringInExtensionString(extension, extensions))
return GL_TRUE;
}
// Check if extension is in the platform-specific string
return _glfwPlatformExtensionSupported(extension);