412f38f270
This adds a static OpenGL ES API. Here are the three commit messages for the original changes: Clean up trivial Eclipse warnings and fix whitespace. Added @Override to overridden methods. Removed unused imports. Converted tabs to spaces. Removed \r characters from end-of-lines. Add .gitignore file to ignore the .class files that are generated when the "gen" script is run. This is the 2nd commit message: Improve glgen + gen script is really a bash script rather than a sh script, so declare that to be true. (For example, it uses pushd, which is a part of bash, but not a part of sh. Not sure how this worked until now. Possibly gen was only run in environments where /bin/sh was really bash. + Check the results of the java compile of the code generator, and abort the script if the compile fails. + Turn on the bash shell option that guards against using uninitialized variables in the script. + Remove the generated class files. Refactor JniCodeEmitter into two classes: a general-purpose JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is to use JniCodeEmitter as a base for emitting static OpenGL ES bindings. This is the 3rd commit message: Add an Android-specific static OpenGL ES 1.1 Java API. This change adds four new public classes that expose a static OpenGL ES 1.1 API: android.opengl.GLES10 android.opengl.GLES10Ext android.opengl.GLES11 android.opengl.GLES11Ext Benefits: + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API. + The static API is similar to the C API, which should make it easier to import C-based example code. + The static API provides a clear path for adding new OpenGL ES 1.1 extensions and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard. Example: import static android.opengl.GLES10.*; ... glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); Note that it is possible to mix-and-match calls to both the static and JSR239 APIs. This works because neither API maintains state. They both call through to the same underlying C OpenGL ES APIs. Implementation details: This change enhances the "glgen" "gen" script to generate both the original JSR239 and new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before, so there is no need to check in new versions of the generated JSR239 classes. As part of this work the gen script was updated to be somewhat more robust, and to work with git instead of perforce. The script prints out commands to git add the generated files, but leaves it up to the script runner to actually execute those commands.
107 lines
6.5 KiB
Plaintext
107 lines
6.5 KiB
Plaintext
void glActiveTexture ( GLenum texture )
|
|
void glAlphaFunc ( GLenum func, GLclampf ref )
|
|
void glAlphaFuncx ( GLenum func, GLclampx ref )
|
|
void glBindTexture ( GLenum target, GLuint texture )
|
|
void glBlendFunc ( GLenum sfactor, GLenum dfactor )
|
|
void glClear ( GLbitfield mask )
|
|
void glClearColor ( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
|
|
void glClearColorx ( GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha )
|
|
void glClearDepthf ( GLclampf depth )
|
|
void glClearDepthx ( GLclampx depth )
|
|
void glClearStencil ( GLint s )
|
|
void glClientActiveTexture ( GLenum texture )
|
|
void glColor4f ( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
|
|
void glColor4x ( GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha )
|
|
void glColorMask ( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha )
|
|
void glColorPointer ( GLint size, GLenum type, GLsizei stride, const GLvoid *pointer )
|
|
void glCompressedTexImage2D ( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data )
|
|
void glCompressedTexSubImage2D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data )
|
|
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 )
|
|
void glCullFace ( GLenum mode )
|
|
void glDeleteTextures ( GLsizei n, const GLuint *textures )
|
|
void glDepthFunc ( GLenum func )
|
|
void glDepthMask ( GLboolean flag )
|
|
void glDepthRangef ( GLclampf zNear, GLclampf zFar )
|
|
void glDepthRangex ( GLclampx zNear, GLclampx zFar )
|
|
void glDisable ( GLenum cap )
|
|
void glDisableClientState ( GLenum array )
|
|
void glDrawArrays ( GLenum mode, GLint first, GLsizei count )
|
|
void glDrawElements ( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices )
|
|
void glEnable ( GLenum cap )
|
|
void glEnableClientState ( GLenum array )
|
|
void glFinish ( void )
|
|
void glFlush ( void )
|
|
void glFogf ( GLenum pname, GLfloat param )
|
|
void glFogfv ( GLenum pname, const GLfloat *params )
|
|
void glFogx ( GLenum pname, GLfixed param )
|
|
void glFogxv ( GLenum pname, const GLfixed *params )
|
|
void glFrontFace ( GLenum mode )
|
|
void glFrustumf ( GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar )
|
|
void glFrustumx ( GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar )
|
|
void glGenTextures ( GLsizei n, GLuint *textures )
|
|
GLenum glGetError ( void )
|
|
void glGetIntegerv ( GLenum pname, GLint *params )
|
|
const GLubyte * glGetString ( GLenum name )
|
|
void glHint ( GLenum target, GLenum mode )
|
|
void glLightModelf ( GLenum pname, GLfloat param )
|
|
void glLightModelfv ( GLenum pname, const GLfloat *params )
|
|
void glLightModelx ( GLenum pname, GLfixed param )
|
|
void glLightModelxv ( GLenum pname, const GLfixed *params )
|
|
void glLightf ( GLenum light, GLenum pname, GLfloat param )
|
|
void glLightfv ( GLenum light, GLenum pname, const GLfloat *params )
|
|
void glLightx ( GLenum light, GLenum pname, GLfixed param )
|
|
void glLightxv ( GLenum light, GLenum pname, const GLfixed *params )
|
|
void glLineWidth ( GLfloat width )
|
|
void glLineWidthx ( GLfixed width )
|
|
void glLoadIdentity ( void )
|
|
void glLoadMatrixf ( const GLfloat *m )
|
|
void glLoadMatrixx ( const GLfixed *m )
|
|
void glLogicOp ( GLenum opcode )
|
|
void glMaterialf ( GLenum face, GLenum pname, GLfloat param )
|
|
void glMaterialfv ( GLenum face, GLenum pname, const GLfloat *params )
|
|
void glMaterialx ( GLenum face, GLenum pname, GLfixed param )
|
|
void glMaterialxv ( GLenum face, GLenum pname, const GLfixed *params )
|
|
void glMatrixMode ( GLenum mode )
|
|
void glMultMatrixf ( const GLfloat *m )
|
|
void glMultMatrixx ( const GLfixed *m )
|
|
void glMultiTexCoord4f ( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q )
|
|
void glMultiTexCoord4x ( GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q )
|
|
void glNormal3f ( GLfloat nx, GLfloat ny, GLfloat nz )
|
|
void glNormal3x ( GLfixed nx, GLfixed ny, GLfixed nz )
|
|
void glNormalPointer ( GLenum type, GLsizei stride, const GLvoid *pointer )
|
|
void glOrthof ( GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar )
|
|
void glOrthox ( GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar )
|
|
void glPixelStorei ( GLenum pname, GLint param )
|
|
void glPointSize ( GLfloat size )
|
|
void glPointSizex ( GLfixed size )
|
|
void glPolygonOffset ( GLfloat factor, GLfloat units )
|
|
void glPolygonOffsetx ( GLfixed factor, GLfixed units )
|
|
void glPopMatrix ( void )
|
|
void glPushMatrix ( void )
|
|
void glReadPixels ( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels )
|
|
void glRotatef ( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
|
|
void glRotatex ( GLfixed angle, GLfixed x, GLfixed y, GLfixed z )
|
|
void glSampleCoverage ( GLclampf value, GLboolean invert )
|
|
void glSampleCoveragex ( GLclampx value, GLboolean invert )
|
|
void glScalef ( GLfloat x, GLfloat y, GLfloat z )
|
|
void glScalex ( GLfixed x, GLfixed y, GLfixed z )
|
|
void glScissor ( GLint x, GLint y, GLsizei width, GLsizei height )
|
|
void glShadeModel ( GLenum mode )
|
|
void glStencilFunc ( GLenum func, GLint ref, GLuint mask )
|
|
void glStencilMask ( GLuint mask )
|
|
void glStencilOp ( GLenum fail, GLenum zfail, GLenum zpass )
|
|
void glTexCoordPointer ( GLint size, GLenum type, GLsizei stride, const GLvoid *pointer )
|
|
void glTexEnvf ( GLenum target, GLenum pname, GLfloat param )
|
|
void glTexEnvfv ( GLenum target, GLenum pname, const GLfloat *params )
|
|
void glTexEnvx ( GLenum target, GLenum pname, GLfixed param )
|
|
void glTexEnvxv ( GLenum target, GLenum pname, const GLfixed *params )
|
|
void glTexImage2D ( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels )
|
|
void glTexParameterf ( GLenum target, GLenum pname, GLfloat param )
|
|
void glTexParameterx ( GLenum target, GLenum pname, GLfixed param )
|
|
void glTexSubImage2D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels )
|
|
void glTranslatef ( GLfloat x, GLfloat y, GLfloat z )
|
|
void glTranslatex ( GLfixed x, GLfixed y, GLfixed z )
|
|
void glVertexPointer ( GLint size, GLenum type, GLsizei stride, const GLvoid *pointer )
|
|
void glViewport ( GLint x, GLint y, GLsizei width, GLsizei height )
|