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

Commit 0eb6ad56 authored by Jesse Hall's avatar Jesse Hall
Browse files

Support "const GLChar*" and "const GLenum*" types 

Bug: 8566953
Change-Id: I349575e592e8b0d93d14237230b69bec4e04cf3e
parent 439bc161

opengl/tools/glgen/src/CType.java

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ public class CType { 
    }



    public boolean isConstCharPointer() {

        return isConst && isPointer && baseType.equals("char");

        return isConst && isPointer &&

            (baseType.equals("char") || baseType.equals("GLchar"));

    }



    public boolean isTypedPointer() {

opengl/tools/glgen/src/JType.java

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public class JType { 
    typeMapping.put(new CType("GLubyte", true, true), new JType("String", false, false));

    typeMapping.put(new CType("char", false, true), new JType("byte"));

    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"));



    // EGL primitive types
@@ -80,6 +81,8 @@ public class JType { 
            new JType("java.nio.IntBuffer", true, false));

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

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

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

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

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

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

    typeMapping.put(new CType("GLfixed", true, true),
@@ -107,6 +110,7 @@ public class JType { 
    arrayTypeMapping.put(new CType("GLboolean", false, true),

            new JType("boolean", false, true));

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

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

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

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

    arrayTypeMapping.put(new CType("GLfloat", false, true), new JType("float", false, true));