From f8f56cbb20817c295fe8c6f886dca5e2912e1996 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Fri, 14 Oct 2016 15:08:21 -0700 Subject: Fix complex clipping on mergeable ops Fixes: 32106003 Test: unit tests passing (and one added) Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59 --- libs/hwui/FrameBuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/FrameBuilder.cpp') 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; } -- cgit v1.2.3-59-g8ed1b