gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-10-08 15:17:25 -04:00
Code Issues Projects Releases Wiki Activity

Renamed context API init/terminate functions.

Browse Source
This commit is contained in:
Camilla Berglund 2013-01-15 20:49:29 +01:00
parent a8ea120cae
commit 38947b37af
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cocoa_init.m
View File

@ -101,7 +101,7 @@ int _glfwPlatformInit(void)
_glfwInitJoysticks(); _glfwInitJoysticks();
if (!_glfwInitOpenGL()) if (!_glfwInitContextAPI())
return GL_FALSE; return GL_FALSE;
_glfw.ns.eventSource = CGEventSourceCreate(kCGEventSourceStateHIDSystemState); _glfw.ns.eventSource = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
@ -141,7 +141,7 @@ void _glfwPlatformTerminate(void)
_glfwTerminateJoysticks(); _glfwTerminateJoysticks();
_glfwTerminateOpenGL(); _glfwTerminateContextAPI();
} }

4
src/cocoa_platform.h
View File

@ -118,8 +118,8 @@ GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, int* width, int* height, int*
void _glfwRestoreVideoMode(_GLFWmonitor* monitor); void _glfwRestoreVideoMode(_GLFWmonitor* monitor);
// OpenGL support // OpenGL support
int _glfwInitOpenGL(void); int _glfwInitContextAPI(void);
void _glfwTerminateOpenGL(void); void _glfwTerminateContextAPI(void);
int _glfwCreateContext(_GLFWwindow* window, int _glfwCreateContext(_GLFWwindow* window,
const _GLFWwndconfig* wndconfig, const _GLFWwndconfig* wndconfig,
const _GLFWfbconfig* fbconfig); const _GLFWfbconfig* fbconfig);

4
src/egl_context.c
View File

@ -61,7 +61,7 @@ static _GLFW_TLS _GLFWwindow* _glfwCurrentWindow = NULL;
// Initialize EGL // Initialize EGL
//======================================================================== //========================================================================
int _glfwInitOpenGL(void) int _glfwInitContextAPI(void)
{ {
_glfw.egl.display = eglGetDisplay(_GLFW_EGL_NATIVE_DISPLAY); _glfw.egl.display = eglGetDisplay(_GLFW_EGL_NATIVE_DISPLAY);
if (_glfw.egl.display == EGL_NO_DISPLAY) if (_glfw.egl.display == EGL_NO_DISPLAY)
@ -89,7 +89,7 @@ int _glfwInitOpenGL(void)
// Terminate EGL // Terminate EGL
//======================================================================== //========================================================================
void _glfwTerminateOpenGL(void) void _glfwTerminateContextAPI(void)
{ {
eglTerminate(_glfw.egl.display); eglTerminate(_glfw.egl.display);
} }

4
src/glx_context.c
View File

@ -113,7 +113,7 @@ static GLXContext createLegacyContext(_GLFWwindow* window,
// Initialize GLX // Initialize GLX
//======================================================================== //========================================================================
int _glfwInitOpenGL(void) int _glfwInitContextAPI(void)
{ {
#ifdef _GLFW_DLOPEN_LIBGL #ifdef _GLFW_DLOPEN_LIBGL
int i; int i;
@ -237,7 +237,7 @@ int _glfwInitOpenGL(void)
// Terminate GLX // Terminate GLX
//======================================================================== //========================================================================
void _glfwTerminateOpenGL(void) void _glfwTerminateContextAPI(void)
{ {
// Unload libGL.so if necessary // Unload libGL.so if necessary
#ifdef _GLFW_DLOPEN_LIBGL #ifdef _GLFW_DLOPEN_LIBGL

4
src/nsgl_context.m
View File

@ -46,7 +46,7 @@ static pthread_key_t _glfwCurrentTLS;
// Initialize OpenGL support // Initialize OpenGL support
//======================================================================== //========================================================================
int _glfwInitOpenGL(void) int _glfwInitContextAPI(void)
{ {
if (pthread_key_create(&_glfwCurrentTLS, NULL) != 0) if (pthread_key_create(&_glfwCurrentTLS, NULL) != 0)
{ {
@ -63,7 +63,7 @@ int _glfwInitOpenGL(void)
// Terminate OpenGL support // Terminate OpenGL support
//======================================================================== //========================================================================
void _glfwTerminateOpenGL(void) void _glfwTerminateContextAPI(void)
{ {
pthread_key_delete(_glfwCurrentTLS); pthread_key_delete(_glfwCurrentTLS);
} }

4
src/x11_init.c
View File

@ -632,7 +632,7 @@ int _glfwPlatformInit(void)
_glfwInitGammaRamp(); _glfwInitGammaRamp();
if (!_glfwInitOpenGL()) if (!_glfwInitContextAPI())
return GL_FALSE; return GL_FALSE;
_glfw.x11.cursor = createNULLCursor(); _glfw.x11.cursor = createNULLCursor();
@ -662,7 +662,7 @@ void _glfwPlatformTerminate(void)
_glfwTerminateJoysticks(); _glfwTerminateJoysticks();
_glfwTerminateOpenGL(); _glfwTerminateContextAPI();
terminateDisplay(); terminateDisplay();

4
src/x11_platform.h
View File

@ -224,8 +224,8 @@ void _glfwInitGammaRamp(void);
void _glfwTerminateGammaRamp(void); void _glfwTerminateGammaRamp(void);
// OpenGL support // OpenGL support
int _glfwInitOpenGL(void); int _glfwInitContextAPI(void);
void _glfwTerminateOpenGL(void); void _glfwTerminateContextAPI(void);
int _glfwCreateContext(_GLFWwindow* window, int _glfwCreateContext(_GLFWwindow* window,
const _GLFWwndconfig* wndconfig, const _GLFWwndconfig* wndconfig,
const _GLFWfbconfig* fbconfig); const _GLFWfbconfig* fbconfig);