Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-05 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes

Browse Source 
Rendering now works if it is on the main thread
This commit is contained in:
Curi0 2017-10-02 17:29:32 +05:30
parent 49ded3c18e
commit e1c09aa2b5
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/context.c
View File

@ -585,12 +585,6 @@ GLFWAPI void glfwMakeContextCurrent(GLFWwindow* handle)
_GLFW_REQUIRE_INIT(); _GLFW_REQUIRE_INIT();
if (window && window->context.client == GLFW_NO_API)
{
_glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
return;
}
if (previous) if (previous)
{ {
if (!window || window->context.source != previous->context.source) if (!window || window->context.source != previous->context.source)

4
src/egl_context.c
View File

@ -311,6 +311,8 @@ GLFWbool _glfwInitEGL(void)
"libEGL.dylib", "libEGL.dylib",
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
"libEGL-1.so", "libEGL-1.so",
#elif defined(_GLFW_ANDROID)
"libEGL.so",
#else #else
"libEGL.so.1", "libEGL.so.1",
#endif #endif
@ -465,7 +467,6 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
EGLConfig config; EGLConfig config;
EGLContext share = NULL; EGLContext share = NULL;
int index = 0; int index = 0;
if (!_glfw.egl.display) if (!_glfw.egl.display)
{ {
_glfwInputError(GLFW_API_UNAVAILABLE, "EGL: API not available"); _glfwInputError(GLFW_API_UNAVAILABLE, "EGL: API not available");
@ -635,6 +636,7 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
"libGLES_CM.so", "libGLES_CM.so",
#else #else
"libGLESv1_CM.so.1", "libGLESv1_CM.so.1",
"libGLES_CM.so.1"
#endif #endif
NULL NULL
}; };