From cb29e6237d7f471a28f8e73116e131f257d9842f Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Fri, 8 May 2009 15:23:38 -0700 Subject: only export the GL entry-points, hide everything else. Conflicts: opengl/libagl/Android.mk opengl/libs/Android.mk opengl/libs/egl_impl.h --- opengl/include/GLES/glext.h | 8 ++++---- opengl/include/KHR/khrplatform.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'opengl/include') diff --git a/opengl/include/GLES/glext.h b/opengl/include/GLES/glext.h index 4c01871..3984333 100644 --- a/opengl/include/GLES/glext.h +++ b/opengl/include/GLES/glext.h @@ -603,13 +603,13 @@ typedef void (GL_APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, * dalvik extension functions *------------------------------------------------------------------------*/ #ifdef ANDROID -void glColorPointerBounds(GLint size, GLenum type, GLsizei stride, +GL_API void GL_APIENTRY glColorPointerBounds(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr, GLsizei count); -void glNormalPointerBounds(GLenum type, GLsizei stride, +GL_API void GL_APIENTRY glNormalPointerBounds(GLenum type, GLsizei stride, const GLvoid *pointer, GLsizei count); -void glTexCoordPointerBounds(GLint size, GLenum type, +GL_API void GL_APIENTRY glTexCoordPointerBounds(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer, GLsizei count); -void glVertexPointerBounds(GLint size, GLenum type, +GL_API void GL_APIENTRY glVertexPointerBounds(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer, GLsizei count); #endif diff --git a/opengl/include/KHR/khrplatform.h b/opengl/include/KHR/khrplatform.h index 4cc27c5..1660bd7 100644 --- a/opengl/include/KHR/khrplatform.h +++ b/opengl/include/KHR/khrplatform.h @@ -91,6 +91,8 @@ # define KHRONOS_APICALL __declspec(dllimport) #elif defined (__SYMBIAN32__) # define KHRONOS_APICALL IMPORT_C +#elif defined(ANDROID) +# define KHRONOS_APICALL __attribute__((visibility("default"))) #else # define KHRONOS_APICALL #endif -- cgit v1.1