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

Commit 68fc8bbc authored by Jesse Hall's avatar Jesse Hall
Browse files

Add *int64 and GLsync types and related functions 

Return values are declared with the C return type, but the JNI
function returns the JNI return type. In the case of GLsync/jlong as
in glFenceSync(), this causes a compile error. So the generator now
explicitly casts the return value to the JNI return type.

Bug: 8566953
Change-Id: I814befe2e4cce745434cbc4e1c8639fc3ce8aeae
parent 2d9faafa

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

+9 −9
Original line number Diff line number Diff line
@@ -218,15 +218,15 @@ void glGetActiveUniformBlockiv ( GLuint program, GLuint uniformBlockIndex, GLenu 
void glUniformBlockBinding ( GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding )

void glDrawArraysInstanced ( GLenum mode, GLint first, GLsizei count, GLsizei instanceCount )

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

// GLsync glFenceSync ( GLenum condition, GLbitfield flags )

// GLboolean glIsSync ( GLsync sync )

// void glDeleteSync ( GLsync sync )

// GLenum glClientWaitSync ( GLsync sync, GLbitfield flags, GLuint64 timeout )

// void glWaitSync ( GLsync sync, GLbitfield flags, GLuint64 timeout )

// void glGetInteger64v ( GLenum pname, GLint64 *params )

// void glGetSynciv ( GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values )

// void glGetInteger64i_v ( GLenum target, GLuint index, GLint64 *data )

// void glGetBufferParameteri64v ( GLenum target, GLenum pname, GLint64 *params )

GLsync glFenceSync ( GLenum condition, GLbitfield flags )

GLboolean glIsSync ( GLsync sync )

void glDeleteSync ( GLsync sync )

GLenum glClientWaitSync ( GLsync sync, GLbitfield flags, GLuint64 timeout )

void glWaitSync ( GLsync sync, GLbitfield flags, GLuint64 timeout )

void glGetInteger64v ( GLenum pname, GLint64 *params )

void glGetSynciv ( GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values )

void glGetInteger64i_v ( GLenum target, GLuint index, GLint64 *data )

void glGetBufferParameteri64v ( GLenum target, GLenum pname, GLint64 *params )

void glGenSamplers ( GLsizei count, GLuint *samplers )

void glDeleteSamplers ( GLsizei count, const GLuint *samplers )

GLboolean glIsSampler ( GLuint sampler )

opengl/tools/glgen/src/JType.java

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ public class JType { 
    typeMapping.put(new CType("char", true, true), new JType("String", false, false));

    typeMapping.put(new CType("GLchar", true, true), new JType("String", false, false));

    typeMapping.put(new CType("int"), new JType("int"));

    typeMapping.put(new CType("GLuint64"), new JType("long"));

    typeMapping.put(new CType("GLsync"), new JType("long"));



    // EGL primitive types

    typeMapping.put(new CType("EGLint"), new JType("int"));
@@ -103,6 +105,8 @@ public class JType { 
            new JType("java.nio.IntBuffer", true, false));

    typeMapping.put(new CType("GLshort", true, true),

            new JType("java.nio.ShortBuffer", true, false));

    typeMapping.put(new CType("GLint64", false, true),

            new JType("java.nio.LongBuffer", true, false));



    // Typed pointers map to arrays + offsets

    arrayTypeMapping.put(new CType("char", false, true),
@@ -124,6 +128,7 @@ public class JType { 
    arrayTypeMapping.put(new CType("GLuint", true, true), new JType("int", false, true));

    arrayTypeMapping.put(new CType("GLintptr"), new JType("int", false, true));

    arrayTypeMapping.put(new CType("GLsizeiptr"), new JType("int", false, true));

    arrayTypeMapping.put(new CType("GLint64", false, true), new JType("long", false, true));



    //EGL typed pointers map to arrays + offsets

    arrayTypeMapping.put(new CType("EGLint", false, true), new JType("int", false, true));

opengl/tools/glgen/src/JniCodeEmitter.java

+2 −1
Original line number Diff line number Diff line
@@ -1421,7 +1421,8 @@ public class JniCodeEmitter { 
                            "return toEGLHandle(_env, " + baseType + "Class, " +

                            baseType + "Constructor, _returnValue);");

            } else {

                out.println(indent + "return _returnValue;");

                out.println(indent + "return (" +

                            getJniType(jfunc.getType()) + ")_returnValue;");

            }

        }