diff options
| author | 2016-10-14 15:08:21 -0700 | |
|---|---|---|
| committer | 2016-10-17 13:40:32 -0700 | |
| commit | f8f56cbb20817c295fe8c6f886dca5e2912e1996 (patch) | |
| tree | 15c18b302b58855d7762a4bb9c264e175b75c8b4 /libs/hwui/FrameBuilder.cpp | |
| parent | a9469e64e4d43c25d4d39000d6506028533648bf (diff) | |
Fix complex clipping on mergeable ops
Fixes: 32106003
Test: unit tests passing (and one added)
Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59
Diffstat (limited to 'libs/hwui/FrameBuilder.cpp')
| -rw-r--r-- | libs/hwui/FrameBuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp index 17ad0e36fa90..dbb66d933c01 100644 --- a/libs/hwui/FrameBuilder.cpp +++ b/libs/hwui/FrameBuilder.cpp @@ -591,7 +591,7 @@ void FrameBuilder::deferArcOp(const ArcOp& op) { } static bool hasMergeableClip(const BakedOpState& state) { - return state.computedState.clipState + return !state.computedState.clipState || state.computedState.clipState->mode == ClipMode::Rectangle; } |