Renamed context API init/terminate functions.
This commit is contained in:
Родитель
a8ea120cae
Коммит
38947b37af
|
@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче