commit f8f56cbb20817c295fe8c6f886dca5e2912e1996
author Chris Craik <ccraik@google.com> Fri Oct 14 15:08:21 2016 -0700
committer Chris Craik <ccraik@google.com> Mon Oct 17 13:40:32 2016 -0700
tree 15c18b302b58855d7762a4bb9c264e175b75c8b4
parent a9469e64e4d43c25d4d39000d6506028533648bf

Fix complex clipping on mergeable ops

Fixes: 32106003
Test: unit tests passing (and one added)

Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59

libs/hwui/FrameBuilder.cpp

diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp
index 17ad0e3..dbb66d9 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;
 }