diff options
| -rw-r--r-- | libs/hwui/FrameBuilder.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp index a3d6401bc86c..3e37a050ecaf 100644 --- a/libs/hwui/FrameBuilder.cpp +++ b/libs/hwui/FrameBuilder.cpp @@ -450,6 +450,10 @@ void FrameBuilder::deferBitmapOp(const BitmapOp& op) { BakedOpState* bakedState = tryBakeOpState(op); if (!bakedState) return; // quick rejected + currentLayer().deferUnmergeableOp(mAllocator, bakedState, OpBatchType::Bitmap); + + // TODO: Fix this ( b/26569206 ) +/* // Don't merge non-simply transformed or neg scale ops, SET_TEXTURE doesn't handle rotation // Don't merge A8 bitmaps - the paint's color isn't compared by mergeId, or in // MergingDrawBatch::canMergeWith() @@ -464,6 +468,7 @@ void FrameBuilder::deferBitmapOp(const BitmapOp& op) { } else { currentLayer().deferUnmergeableOp(mAllocator, bakedState, OpBatchType::Bitmap); } +*/ } void FrameBuilder::deferBitmapMeshOp(const BitmapMeshOp& op) { |