diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | d717598616910b5454b56429dec3bfad2757bd52 (patch) | |
| tree | c2271b0f7e475c4ac1cf520bcecd6f35e002d99a /opengl/include | |
| parent | 5958661507b39cd59e68e9bc2b54399af92847c4 (diff) | |
| parent | 757a434f81895ddcad2481a5912ff1eb0de8a0d6 (diff) | |
| download | frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.zip frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.tar.gz frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'opengl/include')
| -rw-r--r-- | opengl/include/GLES/glext.h | 15 | ||||
| -rw-r--r-- | opengl/include/KHR/khrplatform.h | 2 |
2 files changed, 2 insertions, 15 deletions
diff --git a/opengl/include/GLES/glext.h b/opengl/include/GLES/glext.h index 4c01871..a8fe2e9 100644 --- a/opengl/include/GLES/glext.h +++ b/opengl/include/GLES/glext.h @@ -599,21 +599,6 @@ typedef void (GL_APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, #define GL_EXT_texture_filter_anisotropic 1 #endif -/*------------------------------------------------------------------------* - * dalvik extension functions - *------------------------------------------------------------------------*/ -#ifdef ANDROID -void glColorPointerBounds(GLint size, GLenum type, GLsizei stride, - const GLvoid *ptr, GLsizei count); -void glNormalPointerBounds(GLenum type, GLsizei stride, - const GLvoid *pointer, GLsizei count); -void glTexCoordPointerBounds(GLint size, GLenum type, - GLsizei stride, const GLvoid *pointer, GLsizei count); -void glVertexPointerBounds(GLint size, GLenum type, - GLsizei stride, const GLvoid *pointer, GLsizei count); -#endif - - #ifdef __cplusplus } #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 |