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

Commit 967c7fb2 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Fix projection offset caching"

parents 2f03f90d d04a6b15

libs/hwui/Program.cpp

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ GLuint Program::buildShader(const char* source, GLenum type) { 


void Program::set(const mat4& projectionMatrix, const mat4& modelViewMatrix,

        const mat4& transformMatrix, bool offset) {

    if (projectionMatrix != mProjection) {

    if (projectionMatrix != mProjection || offset != mOffset) {

        if (CC_LIKELY(!offset)) {

            glUniformMatrix4fv(projection, 1, GL_FALSE, &projectionMatrix.data[0]);

        } else {
@@ -177,6 +177,7 @@ void Program::set(const mat4& projectionMatrix, const mat4& modelViewMatrix, 
            glUniformMatrix4fv(projection, 1, GL_FALSE, &p.data[0]);

        }

        mProjection = projectionMatrix;

        mOffset = offset;

    }



    mat4 t(transformMatrix);

libs/hwui/Program.h

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ private: 
    bool mHasSampler;



    mat4 mProjection;

    bool mOffset;

}; // class Program



}; // namespace uirenderer