mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-15 02:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

glfwMakeUserContextCurrent now calls glfwMakeContextCurrent(NULL) to ensure TLS set.

Browse Source
This commit is contained in:
Doug Binks 2020-07-15 11:18:58 +01:00
parent f2b86a25b3
commit 4caca8b20c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/context.c
View File

@ -778,6 +778,9 @@ GLFWAPI void glfwDestroyUserContext(GLFWusercontext* handle)
GLFWAPI void glfwMakeUserContextCurrent(GLFWusercontext* handle) GLFWAPI void glfwMakeUserContextCurrent(GLFWusercontext* handle)
{ {
_GLFWusercontext* context = (_GLFWusercontext*)handle; _GLFWusercontext* context = (_GLFWusercontext*)handle;
glfwMakeContextCurrent(NULL);
if (context) if (context)
context->makeCurrent(context); context->makeCurrent(context);
} }

2
tests/usercontext.c
View File

@ -31,11 +31,9 @@ int main(void)
} }
/* set the user context current */ /* set the user context current */
glfwMakeContextCurrent(NULL);
glfwMakeUserContextCurrent(usercontext); glfwMakeUserContextCurrent(usercontext);
/* set the window context current */ /* set the window context current */
glfwMakeUserContextCurrent(NULL);
glfwMakeContextCurrent(window); glfwMakeContextCurrent(window);
glClearColor( 0.4f, 0.3f, 0.4f, 0.0f ); glClearColor( 0.4f, 0.3f, 0.4f, 0.0f );