Zengtudor
/
glew
mirror of https://github.com/nigels-com/glew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initial #ifdef __ANDROID__ support for the GLEW build.

This commit is contained in:
Nigel Stewart 2012-05-04 14:15:10 -05:00
parent 7b600b4aac
commit e81e12ded0
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
auto/src/glew_head.c
View File

@ -1,7 +1,8 @@
#include <GL/glew.h> #include <GL/glew.h>
#if defined(_WIN32) #if defined(_WIN32)
# include <GL/wglew.h> # include <GL/wglew.h>
#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) #elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
# include <GL/glxew.h> # include <GL/glxew.h>
#endif #endif
@ -72,7 +73,11 @@ void* NSGLGetProcAddress (const GLubyte *name)
void* addr; void* addr;
if (NULL == image) if (NULL == image)
{ {
#ifdef GLEW_REGAL
image = dlopen("libRegal.dylib", RTLD_LAZY);
#else
image = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY); image = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY);
#endif
} }
if( !image ) return NULL; if( !image ) return NULL;
addr = dlsym(image, (const char*)name); addr = dlsym(image, (const char*)name);
@ -94,7 +99,11 @@ void* NSGLGetProcAddress (const GLubyte *name)
char* symbolName; char* symbolName;
if (NULL == image) if (NULL == image)
{ {
#ifdef GLEW_REGAL
image = NSAddImage("libRegal.dylib", NSADDIMAGE_OPTION_RETURN_ON_ERROR);
#else
image = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", NSADDIMAGE_OPTION_RETURN_ON_ERROR); image = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", NSADDIMAGE_OPTION_RETURN_ON_ERROR);
#endif
} }
/* prepend a '_' for the Unix C symbol mangling convention */ /* prepend a '_' for the Unix C symbol mangling convention */
symbolName = malloc(strlen((const char*)name) + 2); symbolName = malloc(strlen((const char*)name) + 2);
@ -120,16 +129,14 @@ void* NSGLGetProcAddress (const GLubyte *name)
*/ */
#if defined(_WIN32) #if defined(_WIN32)
# define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) # define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
#else #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
# if defined(__APPLE__) # define glewGetProcAddress(name) NSGLGetProcAddress(name)
# define glewGetProcAddress(name) NSGLGetProcAddress(name) #elif defined(__sgi) || defined(__sun)
# else # define glewGetProcAddress(name) dlGetProcAddress(name)
# if defined(__sgi) || defined(__sun) #elif defined(__ANDROID__)
# define glewGetProcAddress(name) dlGetProcAddress(name) # define glewGetProcAddress(name) NULL /* TODO */
# else /* __linux */ #else /* __linux */
# define glewGetProcAddress(name) (*glXGetProcAddressARB)(name) # define glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
# endif
# endif
#endif #endif
/* /*

4
auto/src/glew_init_tail.c
View File

@ -36,7 +36,7 @@ GLboolean glewExperimental = GL_FALSE;
#if defined(_WIN32) #if defined(_WIN32)
extern GLenum wglewContextInit (void); extern GLenum wglewContextInit (void);
#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */ #elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
extern GLenum glxewContextInit (void); extern GLenum glxewContextInit (void);
#endif /* _WIN32 */ #endif /* _WIN32 */
@ -47,7 +47,7 @@ GLenum glewInit (void)
if ( r != 0 ) return r; if ( r != 0 ) return r;
#if defined(_WIN32) #if defined(_WIN32)
return wglewContextInit(); return wglewContextInit();
#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */ #elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */
return glxewContextInit(); return glxewContextInit();
#else #else
return r; return r;

2
auto/src/glew_utils.c
View File

@ -32,7 +32,7 @@
#include <GL/glew.h> #include <GL/glew.h>
#if defined(_WIN32) #if defined(_WIN32)
# include <GL/wglew.h> # include <GL/wglew.h>
#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) #elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
# include <GL/glxew.h> # include <GL/glxew.h>
#endif #endif