summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2013-03-19 00:04:10 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-03-19 00:04:10 +0000
commit4ad2f93cff101ffcaea0a9532dc9b17840cd791b (patch)
treef32522b3a5456a0a39d1861c46da773f25a038ef
parente4c9ac2df26f640fa9aeab5928e82bcc59a33da2 (diff)
parentcada41aeb1e4cd87a94df2dfb4dd645309fe66ba (diff)
Merge "Work around saveLayer clipping/transform deferring issues" into jb-mr2-dev
-rw-r--r--libs/hwui/OpenGLRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index e576f76f8660..66681e0a461e 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1805,7 +1805,7 @@ status_t OpenGLRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty,
// All the usual checks and setup operations (quickReject, setupDraw, etc.)
// will be performed by the display list itself
if (displayList && displayList->isRenderable()) {
- if (CC_UNLIKELY(mCaches.drawDeferDisabled)) {
+ if (true || CC_UNLIKELY(mCaches.drawDeferDisabled)) { // NOTE: temporary workaround
ReplayStateStruct replayStruct(*this, dirty, replayFlags);
displayList->replay(replayStruct, 0);
return replayStruct.mDrawGlStatus;