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

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

Merge "Remove Matrix4::load(Matrix4&)"

parents 920d8eb5 7c85c544

libs/hwui/CanvasState.cpp

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ void CanvasState::setMatrix(const SkMatrix& matrix) { 
}



void CanvasState::setMatrix(const Matrix4& matrix) {

    mSnapshot->transform->load(matrix);

    *(mSnapshot->transform) = matrix;

}



void CanvasState::concatMatrix(const SkMatrix& matrix) {

libs/hwui/GlopBuilder.cpp

+3 −3
Original line number Diff line number Diff line
@@ -467,8 +467,8 @@ void GlopBuilder::setTransform(const Matrix4& ortho, const Matrix4& canvas, 
        const int transformFlags) {

    TRIGGER_STAGE(kTransformStage);



    mOutGlop->transform.ortho.load(ortho);

    mOutGlop->transform.canvas.load(canvas);

    mOutGlop->transform.ortho = ortho;

    mOutGlop->transform.canvas = canvas;

    mOutGlop->transform.transformFlags = transformFlags;

}
@@ -615,7 +615,7 @@ void GlopBuilder::build() { 
            shaderMatrix.loadInverse(mOutGlop->transform.canvas);

            shaderMatrix.multiply(mOutGlop->transform.modelView);

        } else {

            shaderMatrix.load(mOutGlop->transform.modelView);

            shaderMatrix = mOutGlop->transform.modelView;

        }

        SkiaShader::store(mCaches, *mShader, shaderMatrix,

                &textureUnit, &mDescription, &(mOutGlop->fill.skiaShaderData));

libs/hwui/Matrix.cpp

+0 −4
Original line number Diff line number Diff line
@@ -152,10 +152,6 @@ void Matrix4::load(const float* v) { 
    mType = kTypeUnknown;

}



void Matrix4::load(const Matrix4& v) {

    *this = v;

}



void Matrix4::load(const SkMatrix& v) {

    memset(data, 0, sizeof(data));

libs/hwui/Matrix.h

+1 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ public: 
    void loadIdentity();



    void load(const float* v);

    void load(const Matrix4& v);

    void load(const SkMatrix& v);



    void loadInverse(const Matrix4& v);
@@ -139,7 +138,7 @@ public: 
    void multiply(const Matrix4& v) {

        Matrix4 u;

        u.loadMultiply(*this, v);

        load(u);

        *this = u;

    }



    void multiply(float v);

libs/hwui/OpenGLRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDef 


    // Transform and alpha always deferred, since they are used by state operations

    // (Note: saveLayer/restore use colorFilter and alpha, so we just save restore everything)

    state.mMatrix.load(*currentMatrix);

    state.mMatrix = *currentMatrix;

    state.mAlpha = currentSnapshot()->alpha;



    // always store/restore, since these are just pointers