commit 5f1c64ef76f6728f3805763b26093fc4590a2bf6
author John Reck <jreck@google.com> Tue Jan 26 18:06:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 26 18:06:04 2016 +0000
tree 08b2cecf8cc1ed38be959763ff428b16d4067e91
parent 9457a20dd5c044682e59afe2794814951372c31b
parent 14de0415bb7c9a98b2585f92ce89fd8f3d2a53be

Merge "Temporarily workaround merged bitmap bug"

libs/hwui/FrameBuilder.cpp

diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp
index a3d6401..3e37a05 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) {