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

Commit ee5b2c6d authored by Chris Craik's avatar Chris Craik
Browse files

Prevent transformed ops from merging in the first place 

bug:8649215

Previously we prevented ops with non-translate transforms from
merging, but missed the case of the first op in a merging batch
containing a non-translate transform.

This fulfills the assumption of drawText's non-immediate mode that
merged ops will have pure translate transforms.

Change-Id: I6f6db341aff3f7e84e74b4c3ccf970d585a2db1a
parent 5584737f

libs/hwui/DisplayListOp.h

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ public: 
    }



    bool mergeAllowed() {

        if (!state.mMatrix.isPureTranslate()) return false;



        // checks that we're unclipped, and srcover

        const Rect& opBounds = state.mBounds;

        return fabs(opBounds.getWidth() - mLocalBounds.getWidth()) < 0.1 &&