From 38947b37af8f813a51517aeda05c253a694bc9cd Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Tue, 15 Jan 2013 20:49:29 +0100
Subject: [PATCH] Renamed context API init/terminate functions.

---
 src/cocoa_init.m     | 4 ++--
 src/cocoa_platform.h | 4 ++--
 src/egl_context.c    | 4 ++--
 src/glx_context.c    | 4 ++--
 src/nsgl_context.m   | 4 ++--
 src/x11_init.c       | 4 ++--
 src/x11_platform.h   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/cocoa_init.m b/src/cocoa_init.m
index 07eb4649..b2e78cd8 100644
--- a/src/cocoa_init.m
+++ b/src/cocoa_init.m
@@ -101,7 +101,7 @@ int _glfwPlatformInit(void)
 
     _glfwInitJoysticks();
 
-    if (!_glfwInitOpenGL())
+    if (!_glfwInitContextAPI())
         return GL_FALSE;
 
     _glfw.ns.eventSource = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
@@ -141,7 +141,7 @@ void _glfwPlatformTerminate(void)
 
     _glfwTerminateJoysticks();
 
-    _glfwTerminateOpenGL();
+    _glfwTerminateContextAPI();
 }
 
 
diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h
index b15d37db..ba40420a 100644
--- a/src/cocoa_platform.h
+++ b/src/cocoa_platform.h
@@ -118,8 +118,8 @@ GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, int* width, int* height, int*
 void _glfwRestoreVideoMode(_GLFWmonitor* monitor);
 
 // OpenGL support
-int _glfwInitOpenGL(void);
-void _glfwTerminateOpenGL(void);
+int _glfwInitContextAPI(void);
+void _glfwTerminateContextAPI(void);
 int _glfwCreateContext(_GLFWwindow* window,
                        const _GLFWwndconfig* wndconfig,
                        const _GLFWfbconfig* fbconfig);
diff --git a/src/egl_context.c b/src/egl_context.c
index 34c1f2f8..7119a796 100644
--- a/src/egl_context.c
+++ b/src/egl_context.c
@@ -61,7 +61,7 @@ static _GLFW_TLS _GLFWwindow* _glfwCurrentWindow = NULL;
 // Initialize EGL
 //========================================================================
 
-int _glfwInitOpenGL(void)
+int _glfwInitContextAPI(void)
 {
     _glfw.egl.display = eglGetDisplay(_GLFW_EGL_NATIVE_DISPLAY);
     if (_glfw.egl.display == EGL_NO_DISPLAY)
@@ -89,7 +89,7 @@ int _glfwInitOpenGL(void)
 // Terminate EGL
 //========================================================================
 
-void _glfwTerminateOpenGL(void)
+void _glfwTerminateContextAPI(void)
 {
     eglTerminate(_glfw.egl.display);
 }
diff --git a/src/glx_context.c b/src/glx_context.c
index 7b57f632..9c105bf5 100644
--- a/src/glx_context.c
+++ b/src/glx_context.c
@@ -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
diff --git a/src/nsgl_context.m b/src/nsgl_context.m
index a9e92f68..91e098c0 100644
--- a/src/nsgl_context.m
+++ b/src/nsgl_context.m
@@ -46,7 +46,7 @@ static pthread_key_t _glfwCurrentTLS;
 // Initialize OpenGL support
 //========================================================================
 
-int _glfwInitOpenGL(void)
+int _glfwInitContextAPI(void)
 {
     if (pthread_key_create(&_glfwCurrentTLS, NULL) != 0)
     {
@@ -63,7 +63,7 @@ int _glfwInitOpenGL(void)
 // Terminate OpenGL support
 //========================================================================
 
-void _glfwTerminateOpenGL(void)
+void _glfwTerminateContextAPI(void)
 {
     pthread_key_delete(_glfwCurrentTLS);
 }
diff --git a/src/x11_init.c b/src/x11_init.c
index 4686f264..3218a778 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -632,7 +632,7 @@ int _glfwPlatformInit(void)
 
     _glfwInitGammaRamp();
 
-    if (!_glfwInitOpenGL())
+    if (!_glfwInitContextAPI())
         return GL_FALSE;
 
     _glfw.x11.cursor = createNULLCursor();
@@ -662,7 +662,7 @@ void _glfwPlatformTerminate(void)
 
     _glfwTerminateJoysticks();
 
-    _glfwTerminateOpenGL();
+    _glfwTerminateContextAPI();
 
     terminateDisplay();
 
diff --git a/src/x11_platform.h b/src/x11_platform.h
index abe45813..5472f1fe 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -224,8 +224,8 @@ void _glfwInitGammaRamp(void);
 void _glfwTerminateGammaRamp(void);
 
 // OpenGL support
-int _glfwInitOpenGL(void);
-void _glfwTerminateOpenGL(void);
+int _glfwInitContextAPI(void);
+void _glfwTerminateContextAPI(void);
 int _glfwCreateContext(_GLFWwindow* window,
                        const _GLFWwndconfig* wndconfig,
                        const _GLFWfbconfig* fbconfig);