Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1cf843d authored by Mathias Agopian's avatar Mathias Agopian Committed by The Android Open Source Project
Browse files

am 8331f72: remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() " 

Merge commit '8331f72078051cdf5a26230ee819f7ef7f9fcc24'

* commit '8331f72078051cdf5a26230ee819f7ef7f9fcc24':
  remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eglext.h
parents f30de004 d373c634

opengl/include/GLES/glext.h

+0 −15
Original line number Diff line number Diff line
@@ -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

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);

#endif





#ifdef __cplusplus

}

#endif

opengl/libs/GLES_CM/gl.cpp

+11 −0
Original line number Diff line number Diff line
@@ -37,6 +37,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);

opengl/tools/glgen/stubs/gles11/GLES10cHeader.cpp

+13 −0
Original line number Diff line number Diff line
@@ -23,6 +23,19 @@ 
#include <GLES/gl.h>

#include <GLES/glext.h>



/* special calls implemented in Android's GLES wrapper used to more

 * efficiently bound-check passed arrays */

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);

}



static int initialized = 0;



static jclass nioAccessClass;

opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp

+13 −0
Original line number Diff line number Diff line
@@ -23,6 +23,19 @@ 
#include <GLES/gl.h>

#include <GLES/glext.h>



/* special calls implemented in Android's GLES wrapper used to more

 * efficiently bound-check passed arrays */

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);

}



static int initialized = 0;



static jclass nioAccessClass;