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/libs/GLES_CM | |
| 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/libs/GLES_CM')
| -rw-r--r-- | opengl/libs/GLES_CM/gl.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp index d1b9ac6..3204d9a 100644 --- a/opengl/libs/GLES_CM/gl.cpp +++ b/opengl/libs/GLES_CM/gl.cpp @@ -35,6 +35,17 @@ using namespace android; // extensions for the framework // ---------------------------------------------------------------------------- +extern "C" { +GL_API void GL_APIENTRY glColorPointerBounds(GLint size, GLenum type, GLsizei stride, + const GLvoid *ptr, GLsizei count); +GL_API void GL_APIENTRY glNormalPointerBounds(GLenum type, GLsizei stride, + const GLvoid *pointer, GLsizei count); +GL_API void GL_APIENTRY glTexCoordPointerBounds(GLint size, GLenum type, + GLsizei stride, const GLvoid *pointer, GLsizei count); +GL_API void GL_APIENTRY glVertexPointerBounds(GLint size, GLenum type, + GLsizei stride, const GLvoid *pointer, GLsizei count); +} + void glColorPointerBounds(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr, GLsizei count) { glColorPointer(size, type, stride, ptr); |