Removed implicit glfwMakeCurrentContext.

Implicitly making the context current makes sense in a
single-window API but less sense in a multi-window one.
This commit is contained in:
Camilla Berglund
2012-08-10 15:29:45 +02:00
parent 2410e2aaf4
commit 2f095cc9e3
24 changed files with 66 additions and 19 deletions
+10
View File
@@ -209,6 +209,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
_GLFWfbconfig fbconfig;
_GLFWwndconfig wndconfig;
_GLFWwindow* window;
_GLFWwindow* previous;
if (!_glfwInitialized)
{
@@ -254,6 +255,9 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
if (!_glfwIsValidContextConfig(&wndconfig))
return GL_FALSE;
// Save the currently current context so it can be restored later
previous = glfwGetCurrentContext();
if (mode != GLFW_WINDOWED && mode != GLFW_FULLSCREEN)
{
_glfwSetError(GLFW_INVALID_ENUM,
@@ -303,6 +307,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
if (!_glfwPlatformCreateWindow(window, &wndconfig, &fbconfig))
{
glfwDestroyWindow(window);
glfwMakeContextCurrent(previous);
return GL_FALSE;
}
@@ -314,6 +319,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
if (!_glfwRefreshContextParams())
{
glfwDestroyWindow(window);
glfwMakeContextCurrent(previous);
return GL_FALSE;
}
@@ -321,9 +327,13 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
if (!_glfwIsValidContext(&wndconfig))
{
glfwDestroyWindow(window);
glfwMakeContextCurrent(previous);
return GL_FALSE;
}
// Restore the previously current context (or NULL)
glfwMakeContextCurrent(previous);
// The GLFW specification states that fullscreen windows have the cursor
// captured by default
if (mode == GLFW_FULLSCREEN)