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

Commit c0d184b8 authored by Jesse Hall's avatar Jesse Hall
Browse files

Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX 

Bug: 8566953
Change-Id: I66085c300a8658a4018796645257edb73be94719
parent 4f669308

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

+0 −155
Original line number Diff line number Diff line 
//

// Inherited OpenGL ES 2.0 functions

//

void glActiveTexture ( GLenum texture )

void glAttachShader ( GLuint program, GLuint shader )

void glBindAttribLocation ( GLuint program, GLuint index, const char *name )

void glBindBuffer ( GLenum target, GLuint buffer )

void glBindFramebuffer ( GLenum target, GLuint framebuffer )

void glBindRenderbuffer ( GLenum target, GLuint renderbuffer )

void glBindTexture ( GLenum target, GLuint texture )

void glBlendColor ( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )

void glBlendEquation ( GLenum mode )

void glBlendEquationSeparate ( GLenum modeRGB, GLenum modeAlpha )

void glBlendFunc ( GLenum sfactor, GLenum dfactor )

void glBlendFuncSeparate ( GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha )

void glBufferData ( GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage )

void glBufferSubData ( GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data )

GLenum glCheckFramebufferStatus ( GLenum target )

void glClear ( GLbitfield mask )

void glClearColor ( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )

void glClearDepthf ( GLfloat depth )

void glClearStencil ( GLint s )

void glColorMask ( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha )

void glCompileShader ( GLuint shader )

void glCompressedTexImage2D ( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data )

void glCompressedTexImage2D ( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, GLsizei offset )

void glCompressedTexSubImage2D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data )

void glCompressedTexSubImage2D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, GLsizei offset )

void glCopyTexImage2D ( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border )

void glCopyTexSubImage2D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height )

GLuint glCreateProgram ( void )

GLuint glCreateShader ( GLenum type )

void glCullFace ( GLenum mode )

void glDeleteBuffers ( GLsizei n, const GLuint *buffers )

void glDeleteFramebuffers ( GLsizei n, const GLuint *framebuffers )

void glDeleteProgram ( GLuint program )

void glDeleteRenderbuffers ( GLsizei n, const GLuint *renderbuffers )

void glDeleteShader ( GLuint shader )

void glDeleteTextures ( GLsizei n, const GLuint *textures )

void glDepthFunc ( GLenum func )

void glDepthMask ( GLboolean flag )

void glDepthRangef ( GLfloat n, GLfloat f )

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 )

void glFinish ( void )

void glFlush ( void )

void glFramebufferRenderbuffer ( GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer )

void glFramebufferTexture2D ( GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level )

void glFrontFace ( GLenum mode )

void glGenBuffers ( GLsizei n, GLuint *buffers )

void glGenerateMipmap ( GLenum target )

void glGenFramebuffers ( GLsizei n, GLuint *framebuffers )

void glGenRenderbuffers ( GLsizei n, GLuint *renderbuffers )

void glGenTextures ( GLsizei n, GLuint *textures )

void glGetActiveAttrib ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name )

void glGetActiveUniform ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name )

void glGetAttachedShaders ( GLuint program, GLsizei maxcount, GLsizei *count, GLuint *shaders )

GLint glGetAttribLocation ( GLuint program, const char *name )

void glGetBooleanv ( GLenum pname, GLboolean *params )

void glGetBufferParameteriv ( GLenum target, GLenum pname, GLint *params )

GLenum glGetError ( void )

void glGetFloatv ( GLenum pname, GLfloat *params )

void glGetFramebufferAttachmentParameteriv ( GLenum target, GLenum attachment, GLenum pname, GLint *params )

void glGetIntegerv ( GLenum pname, GLint *params )

void glGetProgramiv ( GLuint program, GLenum pname, GLint *params )

void glGetProgramInfoLog ( GLuint program, GLsizei bufsize, GLsizei *length, char *infolog )

void glGetRenderbufferParameteriv ( GLenum target, GLenum pname, GLint *params )

void glGetShaderiv ( GLuint shader, GLenum pname, GLint *params )

void glGetShaderInfoLog ( GLuint shader, GLsizei bufsize, GLsizei *length, char *infolog )

void glGetShaderPrecisionFormat ( GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision )

void glGetShaderSource ( GLuint shader, GLsizei bufsize, GLsizei *length, char *source )

const GLubyte * glGetString ( GLenum name )

void glGetTexParameterfv ( GLenum target, GLenum pname, GLfloat *params )

void glGetTexParameteriv ( GLenum target, GLenum pname, GLint *params )

void glGetUniformfv ( GLuint program, GLint location, GLfloat *params )

void glGetUniformiv ( GLuint program, GLint location, GLint *params )

GLint glGetUniformLocation ( GLuint program, const char *name )

void glGetVertexAttribfv ( GLuint index, GLenum pname, GLfloat *params )

void glGetVertexAttribiv ( GLuint index, GLenum pname, GLint *params )

// void glGetVertexAttribPointerv ( GLuint index, GLenum pname, void **pointer )

void glHint ( GLenum target, GLenum mode )

GLboolean glIsBuffer ( GLuint buffer )

GLboolean glIsEnabled ( GLenum cap )

GLboolean glIsFramebuffer ( GLuint framebuffer )

GLboolean glIsProgram ( GLuint program )

GLboolean glIsRenderbuffer ( GLuint renderbuffer )

GLboolean glIsShader ( GLuint shader )

GLboolean glIsTexture ( GLuint texture )

void glLineWidth ( GLfloat width )

void glLinkProgram ( GLuint program )

void glPixelStorei ( GLenum pname, GLint param )

void glPolygonOffset ( GLfloat factor, GLfloat units )

void glReadPixels ( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels )

void glReadPixels ( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei offset )

void glReleaseShaderCompiler ( void )

void glRenderbufferStorage ( GLenum target, GLenum internalformat, GLsizei width, GLsizei height )

void glSampleCoverage ( GLfloat value, GLboolean invert )

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

void glShaderBinary ( GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length )

void glShaderSource ( GLuint shader )

void glStencilFunc ( GLenum func, GLint ref, GLuint mask )

void glStencilFuncSeparate ( GLenum face, GLenum func, GLint ref, GLuint mask )

void glStencilMask ( GLuint mask )

void glStencilMaskSeparate ( GLenum face, GLuint mask )

void glStencilOp ( GLenum fail, GLenum zfail, GLenum zpass )

void glStencilOpSeparate ( GLenum face, GLenum fail, GLenum zfail, GLenum zpass )

void glTexImage2D ( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels )

void glTexImage2D ( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLsizei offset )

void glTexParameterf ( GLenum target, GLenum pname, GLfloat param )

void glTexParameterfv ( GLenum target, GLenum pname, const GLfloat *params )

void glTexParameteri ( GLenum target, GLenum pname, GLint param )

void glTexParameteriv ( GLenum target, GLenum pname, const GLint *params )

void glTexSubImage2D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels )

void glTexSubImage2D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei offset )

void glUniform1f ( GLint location, GLfloat x )

void glUniform1fv ( GLint location, GLsizei count, const GLfloat *v )

void glUniform1i ( GLint location, GLint x )

void glUniform1iv ( GLint location, GLsizei count, const GLint *v )

void glUniform2f ( GLint location, GLfloat x, GLfloat y )

void glUniform2fv ( GLint location, GLsizei count, const GLfloat *v )

void glUniform2i ( GLint location, GLint x, GLint y )

void glUniform2iv ( GLint location, GLsizei count, const GLint *v )

void glUniform3f ( GLint location, GLfloat x, GLfloat y, GLfloat z )

void glUniform3fv ( GLint location, GLsizei count, const GLfloat *v )

void glUniform3i ( GLint location, GLint x, GLint y, GLint z )

void glUniform3iv ( GLint location, GLsizei count, const GLint *v )

void glUniform4f ( GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w )

void glUniform4fv ( GLint location, GLsizei count, const GLfloat *v )

void glUniform4i ( GLint location, GLint x, GLint y, GLint z, GLint w )

void glUniform4iv ( GLint location, GLsizei count, const GLint *v )

void glUniformMatrix2fv ( GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glUniformMatrix3fv ( GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glUniformMatrix4fv ( GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glUseProgram ( GLuint program )

void glValidateProgram ( GLuint program )

void glVertexAttrib1f ( GLuint indx, GLfloat x )

void glVertexAttrib1fv ( GLuint indx, const GLfloat *values )

void glVertexAttrib2f ( GLuint indx, GLfloat x, GLfloat y )

void glVertexAttrib2fv ( GLuint indx, const GLfloat *values )

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 )

//

// New OpenGL ES 3.0 functions

//

void glReadBuffer ( GLenum mode )

void glDrawRangeElements ( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices )

void glDrawRangeElements ( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLsizei offset )

opengl/tools/glgen/stubs/gles11/GLES20Header.java-if

+4 −3
Original line number Diff line number Diff line
@@ -297,8 +297,9 @@ public class GLES20 { 
    public static final int GL_RGB565                                  = 0x8D62;

    public static final int GL_DEPTH_COMPONENT16                       = 0x81A5;

    // GL_STENCIL_INDEX does not appear in gl2.h or gl2ext.h, and there is no

    // token with value 0x1901. It shouldn't be here, but we can't remove it

    // now in case someone is using it.

    // token with value 0x1901.

    //

    @Deprecated

    public static final int GL_STENCIL_INDEX                           = 0x1901;

    public static final int GL_STENCIL_INDEX8                          = 0x8D48;

    public static final int GL_RENDERBUFFER_WIDTH                      = 0x8D42;

opengl/tools/glgen/stubs/gles11/GLES30Header.java-if

+3 −306

File changed.

Preview size limit exceeded, changes collapsed.

opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java

+1 −1

File changed.

Contains only whitespace changes.

opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java

+1 −1

File changed.

Contains only whitespace changes.