diff options
| author | Chris Craik <ccraik@google.com> | 2013-04-18 12:57:07 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2013-04-18 12:57:07 -0700 |
| commit | ee5b2c6de7fb32d945a5a1303012a5f94b719dfa (patch) | |
| tree | 5c61ecf247d8b64e3e864d1fc548dfebd05b64cd /libs | |
| parent | 5584737fff6350ab09fb53e6a73bbff770930727 (diff) | |
| download | frameworks_base-ee5b2c6de7fb32d945a5a1303012a5f94b719dfa.zip frameworks_base-ee5b2c6de7fb32d945a5a1303012a5f94b719dfa.tar.gz frameworks_base-ee5b2c6de7fb32d945a5a1303012a5f94b719dfa.tar.bz2 | |
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
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index ad7edb1..c277c24 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -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 && |