commit d183e0b9886b46656a695a724cee6b9070e433ca
author Chris Craik <ccraik@google.com> Fri Oct 14 15:08:21 2016 -0700
committer Chris Craik <ccraik@google.com> Mon Oct 17 10:51:11 2016 -0700
tree ecc4fa1345bcf8244bbc669e617e3b4e43ed4bc0
parent c00a6cb9c34bfc5c71085d6cd961097edb1b73f5

Fix complex clipping on mergeable ops DO NOT MERGE

Fixes: 32106003

Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59

libs/hwui/FrameBuilder.cpp

diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp
index 37d9d0e7..7524ba0 100644
--- a/libs/hwui/FrameBuilder.cpp
+++ b/libs/hwui/FrameBuilder.cpp
@@ -591,7 +591,7 @@
 }
 
 static bool hasMergeableClip(const BakedOpState& state) {
-    return state.computedState.clipState
+    return !state.computedState.clipState
             || state.computedState.clipState->mode == ClipMode::Rectangle;
 }