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

Merge branch 'master' of github.com:elmindreda/glfw

Browse Source
This commit is contained in:
Camilla Berglund
2013-01-16 20:33:24 +01:00
parent 3a871b9edb cc45a9e53d
commit c00839e4d7
20 changed files with 320 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glx_context.c
+24 -2
View File
@@ -113,7 +113,7 @@ static GLXContext createLegacyContext(_GLFWwindow* window,
// Initialize GLX
//========================================================================
int _glfwInitOpenGL(void)
int _glfwInitContextAPI(void)
{
#ifdef _GLFW_DLOPEN_LIBGL
int i;
@@ -237,7 +237,7 @@ int _glfwInitOpenGL(void)
// Terminate GLX
//========================================================================
void _glfwTerminateOpenGL(void)
void _glfwTerminateContextAPI(void)
{
// Unload libGL.so if necessary
#ifdef _GLFW_DLOPEN_LIBGL
@@ -633,3 +633,25 @@ GLFWglproc _glfwPlatformGetProcAddress(const char* procname)
return _glfw_glXGetProcAddress((const GLubyte*) procname);
}
//////////////////////////////////////////////////////////////////////////
////// GLFW native API //////
//////////////////////////////////////////////////////////////////////////
//========================================================================
// Return the GLX context of the specified window
//========================================================================
GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow* handle)
{
_GLFWwindow* window = (_GLFWwindow*) handle;
if (!_glfwInitialized)
{
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return NULL;
}
return window->glx.context;
}