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

Commit a7ab5c73 authored by Adam Bodnar's avatar Adam Bodnar
Browse files

Update bufferOffset logic in GPU upload functions 

Update JniCodeEmitter.java
to do the correct pointer arithmetic for ByteBuffers
passed to upload functions with position != 0

Bug: 67109954

Test: ./gen, <run printed commands>, build, flash, atest android.opengl.cts.ByteBufferTest

Change-Id: I689e43b4fd40f5d4d928bf694269901d8541df33
parent 6c03e13d

opengl/tools/glgen/src/JniCodeEmitter.java

+35 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



import java.io.PrintStream;

import java.util.Arrays;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.Iterator;
@@ -201,6 +202,33 @@ public class JniCodeEmitter { 
        out.println(iii + ");");

    }



    // Function to automatically generate properly formatted function calls that

    // comply with clang format rules

    public static String formatFunctionCall(String indent, String functionCall) {

        final int MAXLEN = 100;

        String tokens[] = functionCall.split("\\(|\\)", 2);

        String params[] = tokens[1].split(",\\s*");

        String formatted = indent + tokens[0] + "(";

        char[] chars = new char[indent.length() + tokens[0].length() + 1];

        Arrays.fill(chars, ' ');

        String multiIndent = new String(chars);

        ArrayList<String> lines = new ArrayList<String>();

        for(int i = 0; i < params.length; i++) {

            String terminator = ((i == params.length - 1) ? "" : ",");

            if(indent.length() + formatted.length() + params[i].length() > MAXLEN) {

                lines.add(formatted);

                if (!indent.equals(multiIndent)) {

                    indent = multiIndent;

                }

                formatted = indent + params[i] + terminator;

            } else {

              formatted += (i == 0 ? "" : " ") + params[i] + terminator;

            }

        }

        lines.add(formatted);

        return String.join("\n", lines);

    }



    void printIfcheckPostamble(PrintStream out, boolean isBuffer, boolean emitExceptionCheck,

            String iii) {

        printIfcheckPostamble(out, isBuffer, emitExceptionCheck,
@@ -1538,14 +1566,19 @@ public class JniCodeEmitter { 
                                        "_exception ? JNI_ABORT : 0" : "0")) +

                                ");");

                        } else {

                            out.println(indent + indent +

                            String bufferOffset = numBufferArgs <= 1 ? "_bufferOffset" :

                                "_" + cfunc.getArgName(cIndex) + "BufferOffset";

                            String typeCast = "(char *)" + cfunc.getArgName(cIndex);

                            String withOffset = "(void *)(" + typeCast + " - " + bufferOffset + ")";

                            String releasePointerCall = (

                                "releasePointer(_env, " + array + ", " +

                                cfunc.getArgName(cIndex) +

                                withOffset +

                                ", " +

                                (cfunc.getArgType(cIndex).isConst() ?

                                    "JNI_FALSE" : (emitExceptionCheck ?

                                        "_exception ? JNI_FALSE : JNI_TRUE" : "JNI_TRUE")) +

                                ");");

                            out.println(formatFunctionCall(indent + indent, releasePointerCall));

                        }

                        out.println(indent + "}");

                    }