Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-30 05:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call platform API directly where possible.

Browse Source
This commit is contained in:
Camilla Berglund 2014-05-21 11:19:59 +02:00
parent 56f0bb8613
commit 4923f1cf7e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/window.c
View File

@ -219,23 +219,23 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
window->cursorMode = GLFW_CURSOR_NORMAL; window->cursorMode = GLFW_CURSOR_NORMAL;
// Save the currently current context so it can be restored later // Save the currently current context so it can be restored later
previous = (_GLFWwindow*) glfwGetCurrentContext(); previous = _glfwPlatformGetCurrentContext();
// Open the actual window and create its context // Open the actual window and create its context
if (!_glfwPlatformCreateWindow(window, &wndconfig, &ctxconfig, &fbconfig)) if (!_glfwPlatformCreateWindow(window, &wndconfig, &ctxconfig, &fbconfig))
{ {
glfwDestroyWindow((GLFWwindow*) window); glfwDestroyWindow((GLFWwindow*) window);
glfwMakeContextCurrent((GLFWwindow*) previous); _glfwPlatformMakeContextCurrent(previous);
return NULL; return NULL;
} }
glfwMakeContextCurrent((GLFWwindow*) window); _glfwPlatformMakeContextCurrent(window);
// Retrieve the actual (as opposed to requested) context attributes // Retrieve the actual (as opposed to requested) context attributes
if (!_glfwRefreshContextAttribs(&ctxconfig)) if (!_glfwRefreshContextAttribs(&ctxconfig))
{ {
glfwDestroyWindow((GLFWwindow*) window); glfwDestroyWindow((GLFWwindow*) window);
glfwMakeContextCurrent((GLFWwindow*) previous); _glfwPlatformMakeContextCurrent(previous);
return NULL; return NULL;
} }
@ -243,7 +243,7 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
if (!_glfwIsValidContext(&ctxconfig)) if (!_glfwIsValidContext(&ctxconfig))
{ {
glfwDestroyWindow((GLFWwindow*) window); glfwDestroyWindow((GLFWwindow*) window);
glfwMakeContextCurrent((GLFWwindow*) previous); _glfwPlatformMakeContextCurrent(previous);
return NULL; return NULL;
} }
@ -253,10 +253,10 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
_glfwPlatformSwapBuffers(window); _glfwPlatformSwapBuffers(window);
// Restore the previously current context (or NULL) // Restore the previously current context (or NULL)
glfwMakeContextCurrent((GLFWwindow*) previous); _glfwPlatformMakeContextCurrent(previous);
if (wndconfig.monitor == NULL && wndconfig.visible) if (wndconfig.monitor == NULL && wndconfig.visible)
glfwShowWindow((GLFWwindow*) window); _glfwPlatformShowWindow(window);
return (GLFWwindow*) window; return (GLFWwindow*) window;
} }