commit 7435eb148e72382126e9073183e881357bb38a8b
author Chris Craik <ccraik@google.com> Thu Jan 07 17:41:40 2016 -0800
committer Chris Craik <ccraik@google.com> Fri Jan 08 16:05:35 2016 -0800
tree f090018a61fcaa754f53f7c3dce66a5068311c77
parent d1d533610aad279f7ae9037f0e4b3dd865bb0a24

Unclipped savelayer support in new renderer

bug:22480459

Change-Id: I89dd5de8d7d008a1e298d227d767aabff5c96e27

libs/hwui/BakedOpState.h

diff --git a/libs/hwui/BakedOpState.h b/libs/hwui/BakedOpState.h
index 70b0484..5c7b43f 100644
--- a/libs/hwui/BakedOpState.h
+++ b/libs/hwui/BakedOpState.h
@@ -58,9 +58,8 @@
     // Constructor for unbounded ops without transform/clip (namely shadows)
     ResolvedRenderState(LinearAllocator& allocator, Snapshot& snapshot);
 
-    // Constructor for primitive ops without clip or transform
-    // NOTE: these ops can't be queried for RT clip / local clip
-    ResolvedRenderState(const Rect& dstRect);
+    // Constructor for primitive ops provided clip, and no transform
+    ResolvedRenderState(const ClipRect* viewportRect, const Rect& dstRect);
 
     Rect computeLocalSpaceClip() const {
         Matrix4 inverse;
@@ -71,15 +70,13 @@
         return outClip;
     }
 
-    // NOTE: Can only be used on clipped/snapshot based ops
     const Rect& clipRect() const {
         return clipState->rect;
     }
 
-    // NOTE: Can only be used on clipped/snapshot based ops
     bool requiresClip() const {
         return clipSideFlags != OpClipSideFlags::None
-                || CC_UNLIKELY(clipState->mode != ClipMode::Rectangle);
+               || CC_UNLIKELY(clipState->mode != ClipMode::Rectangle);
     }
 
     // returns the clip if it's needed to draw the operation, otherwise nullptr
@@ -144,8 +141,8 @@
     }
 
     static BakedOpState* directConstruct(LinearAllocator& allocator,
-            const Rect& dstRect, const RecordedOp& recordedOp) {
-        return new (allocator) BakedOpState(dstRect, recordedOp);
+            const ClipRect* clip, const Rect& dstRect, const RecordedOp& recordedOp) {
+        return new (allocator) BakedOpState(clip, dstRect, recordedOp);
     }
 
     static void* operator new(size_t size, LinearAllocator& allocator) {
@@ -177,8 +174,8 @@
             , projectionPathMask(snapshot.projectionPathMask)
             , op(shadowOpPtr) {}
 
-    BakedOpState(const Rect& dstRect, const RecordedOp& recordedOp)
-            : computedState(dstRect)
+    BakedOpState(const ClipRect* viewportRect, const Rect& dstRect, const RecordedOp& recordedOp)
+            : computedState(viewportRect, dstRect)
             , alpha(1.0f)
             , roundRectClipState(nullptr)
             , projectionPathMask(nullptr)