Temporarily workaround merged bitmap bug
Bug: 26569206
Merged bitmap ops are buggy, just turn them off for
now to unblock testing
Change-Id: Ic0151bb3f23b1843107806659a64b26fd6d6e19e
diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp
index c4c655b..aa905c5 100644
--- a/libs/hwui/FrameBuilder.cpp
+++ b/libs/hwui/FrameBuilder.cpp
@@ -450,6 +450,10 @@
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 @@
} else {
currentLayer().deferUnmergeableOp(mAllocator, bakedState, OpBatchType::Bitmap);
}
+*/
}
void FrameBuilder::deferBitmapMeshOp(const BitmapMeshOp& op) {