summaryrefslogtreecommitdiffstats
path: root/libs/hwui/DeferredDisplayList.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2013-09-18 01:49:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-18 01:49:32 +0000
commita42ceb03cf6a1cbcd9f526afb02d806b2c200ee3 (patch)
tree78925e53817b579c4a7952b74900be75fa5492c1 /libs/hwui/DeferredDisplayList.cpp
parent9b6459841e52b9d44ec8ec57af5eb8007841f93d (diff)
parentd965bc5823d878a3fd056b8a95fb4eb578ed3fe4 (diff)
downloadframeworks_base-a42ceb03cf6a1cbcd9f526afb02d806b2c200ee3.zip
frameworks_base-a42ceb03cf6a1cbcd9f526afb02d806b2c200ee3.tar.gz
frameworks_base-a42ceb03cf6a1cbcd9f526afb02d806b2c200ee3.tar.bz2
Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-dev
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 c0b77c7..7eb7028 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