[Bf-blender-cvs] [70df122] soc-2014-viewport_context: this should fix linking errors when trying to use EGL
Jason Wilkins
noreply at git.blender.org
Thu Jul 31 12:14:54 CEST 2014
Commit: 70df1226930416e8d51b4df867b33c6d84c77e52
Author: Jason Wilkins
Date: Thu Jul 31 05:13:22 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB70df1226930416e8d51b4df867b33c6d84c77e52
this should fix linking errors when trying to use EGL
===================================================================
M extern/glew-es/src/glew.c
===================================================================
diff --git a/extern/glew-es/src/glew.c b/extern/glew-es/src/glew.c
index fda6b41..080c49f 100644
--- a/extern/glew-es/src/glew.c
+++ b/extern/glew-es/src/glew.c
@@ -16735,10 +16735,8 @@ GLboolean glewExperimental = GL_FALSE;
#if !defined(GLEW_MX)
-#if defined(GLEW_USE_LIB_ES)
-# if defined (GLEW_INC_EGL)
-extern GLenum eglewContextInit (void);
-# endif
+#if defined (GLEW_INC_EGL)
+extern GLenum eglewContextInit (EGLDisplay display);
#elif defined(_WIN32)
extern GLenum wglewContextInit (void);
#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */
@@ -16749,15 +16747,13 @@ GLenum glewInit ()
{
GLenum r;
if ( (r = glewContextInit()) ) return r;
-#if defined(GLEW_USE_LIB_ES)
-# if defined (GLEW_INC_EGL)
- return eglewContextInit();
-# endif
+#if defined (GLEW_INC_EGL)
+ return eglewContextInit(eglGetCurrentDisplay());
#elif defined(_WIN32)
return wglewContextInit();
#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */
return glxewContextInit();
-#endif /* GLEW_USE_LIB_ES */
+#endif /* GLEW_INC_EGL */
return r;
}
More information about the Bf-blender-cvs
mailing list