diff options
| author | 2016-02-03 19:45:06 -0800 | |
|---|---|---|
| committer | 2016-02-03 20:09:00 -0800 | |
| commit | 7fc1b0349bc2ac8c880120dc5611f703faa7f06f (patch) | |
| tree | 6eb28dc729ca8fcecc3be81bffb27828e32052e9 /libs/hwui/FrameBuilder.cpp | |
| parent | d38308e4d0599836f9c5446ba9d6edbc0713c428 (diff) | |
Fix ripple clipping + quick rejection
bug:26524690
Don't intersect the first clip with the viewport. Instead, the first
clip op should always be a replace op.
Additionally, only quick reject nodes that clip to bounds, since some
nodes (like ripples) draw outside their own bounds.
Change-Id: I96a52029f360328aba19af7349888cc0a026b5b1
Diffstat (limited to 'libs/hwui/FrameBuilder.cpp')
| -rw-r--r-- | libs/hwui/FrameBuilder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp index a45721249542..1c765f65eb8f 100644 --- a/libs/hwui/FrameBuilder.cpp +++ b/libs/hwui/FrameBuilder.cpp @@ -208,7 +208,9 @@ void FrameBuilder::deferNodePropsAndOps(RenderNode& node) { mCanvasState.setClippingOutline(mAllocator, &(properties.getOutline())); } - if (!mCanvasState.quickRejectConservative(0, 0, width, height)) { + bool quickRejected = properties.getClipToBounds() + && mCanvasState.quickRejectConservative(0, 0, width, height); + if (!quickRejected) { // not rejected, so defer render as either Layer, or direct (possibly wrapped in saveLayer) if (node.getLayer()) { // HW layer |