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

Commit 640579b7 authored by Siva Velusamy's avatar Siva Velusamy Committed by Android (Google) Code Review
Browse files

Merge "gltrace: Make code 64-bit safe."

parents ed0ecb08 9801142a

opengl/libs/GLES_trace/src/gltrace_api.cpp

+1991 −440

File changed.

Preview size limit exceeded, changes collapsed.

opengl/libs/GLES_trace/src/gltrace_fixup.cpp

+112 −111

File changed.

Preview size limit exceeded, changes collapsed.

opengl/libs/GLES_trace/src/gltrace_fixup.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ namespace gltrace { 


void fixupGLMessage(GLTraceContext *curContext, nsecs_t wallStart, nsecs_t wallEnd,

                                                nsecs_t threadStart, nsecs_t threadEnd,

                                                GLMessage *message);

                                                GLMessage *message, void *pointersToFixup[]);

void fixup_addFBContents(GLTraceContext *curContext, GLMessage *message, FBBinding fbToRead);



};

opengl/libs/GLES_trace/tools/genapi.py

+14 −3
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ GL2PROTOBUF_TYPE_MAP = { 
    "GLclampf":DataType.FLOAT,

    "GLfixed":DataType.INT,

    "GLclampx":DataType.INT,

    "GLsizeiptr":DataType.POINTER,

    "GLintptr":DataType.POINTER,

    "GLsizeiptr":DataType.INT,

    "GLintptr":DataType.INT,

    "GLeglImageOES":DataType.POINTER,

}
@@ -180,9 +180,20 @@ TRACE_CALL_TEMPLATE = pyratemp.Template( 
    rt->$!retDataType.getProtobufCall()!$retValue);

<!--(end)-->



    void *pointerArgs[] = {

<!--(for argname, argtype in parsedArgs)-->

    <!--(if argtype == DataType.POINTER)-->

        (void *) $!argname!$,

    <!--(end)-->

<!--(end)-->

<!--(if retDataType == DataType.POINTER)-->

        (void *) retValue,

<!--(end)-->

    };



    fixupGLMessage(glContext, wallStartTime, wallEndTime,

                              threadStartTime, threadEndTime,

                              &glmsg);

                              &glmsg, pointerArgs);

    glContext->traceGLMessage(&glmsg);

<!--(if retType != "void")-->