summaryrefslogtreecommitdiffstats
path: root/libs/hwui/DeferredDisplayList.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2013-09-16 14:47:13 -0700
committerChris Craik <ccraik@google.com>2013-09-16 18:19:55 -0700
commitd965bc5823d878a3fd056b8a95fb4eb578ed3fe4 (patch)
tree708968d03c9260b2cc3f3bcd5eea4355c3146f63 /libs/hwui/DeferredDisplayList.cpp
parent0f3e1487b26a822697f70747290809081c2072cc (diff)
downloadframeworks_base-d965bc5823d878a3fd056b8a95fb4eb578ed3fe4.zip
frameworks_base-d965bc5823d878a3fd056b8a95fb4eb578ed3fe4.tar.gz
frameworks_base-d965bc5823d878a3fd056b8a95fb4eb578ed3fe4.tar.bz2
Disallow negative scale matrices in merged Bitmap drawing
bug:10622962 Change-Id: I55ac18ad56b53dc9e6e6ea14cd3ec4bdafa98ac3
Diffstat (limited to 'libs/hwui/DeferredDisplayList.cpp')
-rw-r--r--libs/hwui/DeferredDisplayList.cpp5
1 files changed, 5 insertions, 0 deletions
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 @@ public:
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