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

Commit 037256be authored by Jack Palevich's avatar Jack Palevich Committed by Android Git Automerger
Browse files

am 1e08cc1d: am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer. 

Merge commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c'

* commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c':
  Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
parents a3cf303a 0a516286

opengl/tools/glgen/specs/gles11/GLES20.spec

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ void glDetachShader ( GLuint program, GLuint shader ) 
void glDisable ( GLenum cap )

void glDisableVertexAttribArray ( GLuint index )

void glDrawArrays ( GLenum mode, GLint first, GLsizei count )

void glDrawElements ( GLenum mode, GLsizei count, GLenum type, GLint offset )

void glDrawElements ( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices )

void glEnable ( GLenum cap )

void glEnableVertexAttribArray ( GLuint index )
@@ -138,5 +139,6 @@ void glVertexAttrib3f ( GLuint indx, GLfloat x, GLfloat y, GLfloat z ) 
void glVertexAttrib3fv ( GLuint indx, const GLfloat *values )

void glVertexAttrib4f ( GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w )

void glVertexAttrib4fv ( GLuint indx, const GLfloat *values )

void glVertexAttribPointer ( GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLint offset )

void glVertexAttribPointer ( GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *ptr )

void glViewport ( GLint x, GLint y, GLsizei width, GLsizei height )

opengl/tools/glgen/src/JniCodeEmitter.java

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ public class JniCodeEmitter { 
        boolean isPointerFunc = isPointerFunc(jfunc);

        boolean isVBOPointerFunc = (outName.endsWith("Pointer") ||

                outName.endsWith("PointerOES") ||

            outName.endsWith("DrawElements")) &&

            outName.endsWith("DrawElements") || outName.endsWith("VertexAttribPointer")) &&

            !jfunc.getCFunc().hasPointerArg();

        if (isPointerFunc) {

            outName += "Bounds";