commit d965bc5823d878a3fd056b8a95fb4eb578ed3fe4
author Chris Craik <ccraik@google.com> Mon Sep 16 14:47:13 2013 -0700
committer Chris Craik <ccraik@google.com> Mon Sep 16 18:19:55 2013 -0700
tree 708968d03c9260b2cc3f3bcd5eea4355c3146f63
parent 0f3e1487b26a822697f70747290809081c2072cc

Disallow negative scale matrices in merged Bitmap drawing

bug:10622962

Change-Id: I55ac18ad56b53dc9e6e6ea14cd3ec4bdafa98ac3

libs/hwui/DeferredDisplayList.cpp

diff --git a/libs/hwui/DeferredDisplayList.cpp b/libs/hwui/DeferredDisplayList.cpp
index fd9257a..0131be3 100644
--- a/libs/hwui/DeferredDisplayList.cpp
+++ b/libs/hwui/DeferredDisplayList.cpp
@@ -275,6 +275,11 @@
         DisplayListLogBuffer& buffer = DisplayListLogBuffer::getInstance();
         buffer.writeCommand(0, "multiDraw");
         buffer.writeCommand(1, op->name());
+
+#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS
+        renderer.eventMark("multiDraw");
+        renderer.eventMark(op->name());
+#endif
         status_t status = op->multiDraw(renderer, dirty, mOps, mBounds);
 
 #if DEBUG_MERGE_BEHAVIOR