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

Commit d23d5b19 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev 

* commit '7c9bd98a':
  Fix projection offset caching - DO NOT MERGE
parents dca18258 7c9bd98a

libs/hwui/Program.cpp

+2 −1
Original line number Original line 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,

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

        const mat4& transformMatrix, bool offset) {

        const mat4& transformMatrix, bool offset) {

    if (projectionMatrix != mProjection) {

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

        if (CC_LIKELY(!offset)) {

        if (CC_LIKELY(!offset)) {

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

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

        } else {

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

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

        }

        }

        mProjection = projectionMatrix;

        mProjection = projectionMatrix;

        mOffset = offset;

    }

    }





    mat4 t(transformMatrix);

    mat4 t(transformMatrix);

libs/hwui/Program.h

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

    bool mHasSampler;





    mat4 mProjection;

    mat4 mProjection;

    bool mOffset;

}; // class Program

}; // class Program





}; // namespace uirenderer

}; // namespace uirenderer