diff options
| author | 2009-05-08 15:51:01 -0700 | |
|---|---|---|
| committer | 2009-05-08 15:51:01 -0700 | |
| commit | 3a04bd324aa0d29d0adb9d3fbb9c60b7e1694a28 (patch) | |
| tree | e1f682edcf74bdc75ae2060affdd74bc9c9effd2 /opengl | |
| parent | 851a54143c15a1c33361efae2db3f7f45059b472 (diff) | |
| parent | cb29e6237d7f471a28f8e73116e131f257d9842f (diff) | |
Merge change 1289 into donut
* changes:
only export the GL entry-points, hide everything else.
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/include/GLES/glext.h | 8 | ||||
| -rw-r--r-- | opengl/include/KHR/khrplatform.h | 2 | ||||
| -rw-r--r-- | opengl/libagl/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/libs/Android.mk | 4 | ||||
| -rw-r--r-- | opengl/libs/egl_impl.h | 2 |
5 files changed, 14 insertions, 4 deletions
diff --git a/opengl/include/GLES/glext.h b/opengl/include/GLES/glext.h index 4c01871aeec5..3984333f93f3 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 4cc27c52da8f..1660bd7fea3a 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 diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 99efe4c41de8..3ce0414d8277 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -33,6 +33,8 @@ ifneq ($(TARGET_SIMULATOR),true) endif LOCAL_SHARED_LIBRARIES := libcutils libutils libpixelflinger +LOCAL_CFLAGS += -fvisibility=hidden + LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libagl diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index d636d73fae69..5ba6b76c10ec 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -23,6 +23,8 @@ else LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private endif +LOCAL_CFLAGS += -fvisibility=hidden + include $(BUILD_SHARED_LIBRARY) @@ -49,4 +51,6 @@ else LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private endif +LOCAL_CFLAGS += -fvisibility=hidden + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/libs/egl_impl.h b/opengl/libs/egl_impl.h index 62ce3fce1700..312b17601531 100644 --- a/opengl/libs/egl_impl.h +++ b/opengl/libs/egl_impl.h @@ -20,6 +20,8 @@ #include <ctype.h> #include <EGL/egl.h> +#include <EGL/eglext.h> +#include <EGL/eglplatform.h> // ---------------------------------------------------------------------------- namespace android { |