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

Commit 6487b67d authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "opengl: Add GLES31 and GLES31Ext class templates"

parents fca1b540 16f03928

opengl/tools/glgen/gen

+4 −2
Original line number Diff line number Diff line
@@ -105,7 +105,9 @@ javac -d classes android/opengl/EGL14.java \ 
                    android/opengl/GLES11.java \

                    android/opengl/GLES11Ext.java \

                    android/opengl/GLES20.java \

                    android/opengl/GLES30.java

                    android/opengl/GLES30.java \

                    android/opengl/GLES31.java \

                    android/opengl/GLES31Ext.java

popd > /dev/null

JAVA_RESULT=$?

if [ $JAVA_RESULT -ne 0 ]; then
@@ -152,7 +154,7 @@ do 
    compareGenerated ../../../../base/opengl/java/javax/microedition/khronos/opengles generated/javax/microedition/khronos/opengles $x

done



for x in EGL14 EGLExt GLES10 GLES10Ext GLES11 GLES11Ext GLES20 GLES30

for x in EGL14 EGLExt GLES10 GLES10Ext GLES11 GLES11Ext GLES20 GLES30 GLES31 GLES31Ext

do

    compareGenerated ../../../../base/opengl/java/android/opengl generated/android/opengl ${x}.java

    compareGenerated ../../../../base/core/jni generated/C android_opengl_${x}.cpp

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

0 → 100644
+68 −0
Original line number Diff line number Diff line 
void glDispatchCompute ( GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z )

void glDispatchComputeIndirect ( GLintptr indirect )

void glDrawArraysIndirect ( GLenum mode, const void *indirect )

void glDrawElementsIndirect ( GLenum mode, GLenum type, const void *indirect )

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

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

void glGetProgramInterfaceiv ( GLuint program, GLenum programInterface, GLenum pname, GLint *params )

GLuint glGetProgramResourceIndex ( GLuint program, GLenum programInterface, const GLchar *name )

void glGetProgramResourceName ( GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name )

void glGetProgramResourceiv ( GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params )

GLint glGetProgramResourceLocation ( GLuint program, GLenum programInterface, const GLchar *name )

void glUseProgramStages ( GLuint pipeline, GLbitfield stages, GLuint program )

void glActiveShaderProgram ( GLuint pipeline, GLuint program )

GLuint glCreateShaderProgramv ( GLenum type, GLsizei count, const GLchar *const *strings )

void glBindProgramPipeline ( GLuint pipeline )

void glDeleteProgramPipelines ( GLsizei n, const GLuint *pipelines )

void glGenProgramPipelines ( GLsizei n, GLuint *pipelines )

GLboolean glIsProgramPipeline ( GLuint pipeline )

void glGetProgramPipelineiv ( GLuint pipeline, GLenum pname, GLint *params )

void glProgramUniform1i ( GLuint program, GLint location, GLint v0 )

void glProgramUniform2i ( GLuint program, GLint location, GLint v0, GLint v1 )

void glProgramUniform3i ( GLuint program, GLint location, GLint v0, GLint v1, GLint v2 )

void glProgramUniform4i ( GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3 )

void glProgramUniform1ui ( GLuint program, GLint location, GLuint v0 )

void glProgramUniform2ui ( GLuint program, GLint location, GLuint v0, GLuint v1 )

void glProgramUniform3ui ( GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2 )

void glProgramUniform4ui ( GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3 )

void glProgramUniform1f ( GLuint program, GLint location, GLfloat v0 )

void glProgramUniform2f ( GLuint program, GLint location, GLfloat v0, GLfloat v1 )

void glProgramUniform3f ( GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2 )

void glProgramUniform4f ( GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3 )

void glProgramUniform1iv ( GLuint program, GLint location, GLsizei count, const GLint *value )

void glProgramUniform2iv ( GLuint program, GLint location, GLsizei count, const GLint *value )

void glProgramUniform3iv ( GLuint program, GLint location, GLsizei count, const GLint *value )

void glProgramUniform4iv ( GLuint program, GLint location, GLsizei count, const GLint *value )

void glProgramUniform1uiv ( GLuint program, GLint location, GLsizei count, const GLuint *value )

void glProgramUniform2uiv ( GLuint program, GLint location, GLsizei count, const GLuint *value )

void glProgramUniform3uiv ( GLuint program, GLint location, GLsizei count, const GLuint *value )

void glProgramUniform4uiv ( GLuint program, GLint location, GLsizei count, const GLuint *value )

void glProgramUniform1fv ( GLuint program, GLint location, GLsizei count, const GLfloat *value )

void glProgramUniform2fv ( GLuint program, GLint location, GLsizei count, const GLfloat *value )

void glProgramUniform3fv ( GLuint program, GLint location, GLsizei count, const GLfloat *value )

void glProgramUniform4fv ( GLuint program, GLint location, GLsizei count, const GLfloat *value )

void glProgramUniformMatrix2fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glProgramUniformMatrix3fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glProgramUniformMatrix4fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glProgramUniformMatrix2x3fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glProgramUniformMatrix3x2fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glProgramUniformMatrix2x4fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glProgramUniformMatrix4x2fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glProgramUniformMatrix3x4fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glProgramUniformMatrix4x3fv ( GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value )

void glValidateProgramPipeline ( GLuint pipeline )

void glGetProgramPipelineInfoLog ( GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog )

void glBindImageTexture ( GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format )

void glGetBooleani_v ( GLenum target, GLuint index, GLboolean *data )

void glMemoryBarrier ( GLbitfield barriers )

void glMemoryBarrierByRegion ( GLbitfield barriers )

void glTexStorage2DMultisample ( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations )

void glGetMultisamplefv ( GLenum pname, GLuint index, GLfloat *val )

void glSampleMaski ( GLuint maskNumber, GLbitfield mask )

void glGetTexLevelParameteriv ( GLenum target, GLint level, GLenum pname, GLint *params )

void glGetTexLevelParameterfv ( GLenum target, GLint level, GLenum pname, GLfloat *params )

void glBindVertexBuffer ( GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride )

void glVertexAttribFormat ( GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset )

void glVertexAttribIFormat ( GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset )

void glVertexAttribBinding ( GLuint attribindex, GLuint bindingindex )

void glVertexBindingDivisor ( GLuint bindingindex, GLuint divisor )

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

0 → 100644
+36 −0
Original line number Diff line number Diff line 
void glBlendBarrierKHR ( void )

void glDebugMessageControlKHR ( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled )

void glDebugMessageInsertKHR ( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf )

void glDebugMessageCallbackKHR ( GLDEBUGPROCKHR callback, const void *userParam )

GLuint glGetDebugMessageLogKHR ( GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog )

void glPushDebugGroupKHR ( GLenum source, GLuint id, GLsizei length, const GLchar *message )

void glPopDebugGroupKHR ( void )

void glObjectLabelKHR ( GLenum identifier, GLuint name, GLsizei length, const GLchar *label )

void glGetObjectLabelKHR ( GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label )

void glObjectPtrLabelKHR ( const void *ptr, GLsizei length, const GLchar *label )

void glGetObjectPtrLabelKHR ( const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label )

void glGetPointervKHR ( GLenum pname, void **params )

void glMinSampleShadingOES ( GLfloat value )

void glTexStorage3DMultisampleOES ( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations )

void glCopyImageSubDataEXT ( GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth )

void glEnableiEXT ( GLenum target, GLuint index )

void glDisableiEXT ( GLenum target, GLuint index )

void glBlendEquationiEXT ( GLuint buf, GLenum mode )

void glBlendEquationSeparateiEXT ( GLuint buf, GLenum modeRGB, GLenum modeAlpha )

void glBlendFunciEXT ( GLuint buf, GLenum src, GLenum dst )

void glBlendFuncSeparateiEXT ( GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha )

void glColorMaskiEXT ( GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a )

GLboolean glIsEnablediEXT ( GLenum target, GLuint index )

void glFramebufferTextureEXT ( GLenum target, GLenum attachment, GLuint texture, GLint level )

void glPrimitiveBoundingBoxEXT ( GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW )

void glPatchParameteriEXT ( GLenum pname, GLint value )

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

void glTexParameterIuivEXT ( GLenum target, GLenum pname, const GLuint *params )

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

void glGetTexParameterIuivEXT ( GLenum target, GLenum pname, GLuint *params )

void glSamplerParameterIivEXT ( GLuint sampler, GLenum pname, const GLint *param )

void glSamplerParameterIuivEXT ( GLuint sampler, GLenum pname, const GLuint *param )

void glGetSamplerParameterIivEXT ( GLuint sampler, GLenum pname, GLint *params )

void glGetSamplerParameterIuivEXT ( GLuint sampler, GLenum pname, GLuint *params )

void glTexBufferEXT ( GLenum target, GLenum internalformat, GLuint buffer )

void glTexBufferRangeEXT ( GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size )

opengl/tools/glgen/src/GenerateGLES.java

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ public class GenerateGLES { 


        // Generate files

        for(String suffix: new String[] {"GLES10", "GLES10Ext",

                "GLES11", "GLES11Ext", "GLES20", "GLES30"})

                "GLES11", "GLES11Ext", "GLES20",

                "GLES30", "GLES31", "GLES31Ext"})

        {

            BufferedReader spec11Reader =

                new BufferedReader(new FileReader("specs/gles11/"

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

0 → 100644
+257 −0

File added.

Preview size limit exceeded, changes collapsed.