Push full screen clears up to OpList

Change-Id: Icfc09b3b25f4d3834bee93286e2b24a559f44ed8
Reviewed-on: https://skia-review.googlesource.com/40120
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index b62cee5531..ef4bdacdd2 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -45,7 +45,6 @@ public:
             return;
         }
 
-        fLastFullClearOp = nullptr;
         this->forwardCombine(caps);
 
         INHERITED::makeClosed(caps);
@@ -78,6 +77,8 @@ public:
         return this->uniqueID();
     }
 
+    void discard();
+
     /** Clears the entire render target */
     void fullClear(const GrCaps& caps, GrColor color);
 
@@ -124,10 +125,8 @@ private:
         GrAppliedClip* fAppliedClip;
     };
 
-    // If the input op is combined with an earlier op, this returns the combined op. Otherwise, it
-    // returns the input op.
-    GrOp* recordOp(std::unique_ptr<GrOp>, const GrCaps& caps,
-                   GrAppliedClip* = nullptr, const DstProxy* = nullptr);
+    void recordOp(std::unique_ptr<GrOp>, const GrCaps& caps,
+                  GrAppliedClip* = nullptr, const DstProxy* = nullptr);
 
     void forwardCombine(const GrCaps&);
 
@@ -135,8 +134,6 @@ private:
     bool combineIfPossible(const RecordedOp& a, GrOp* b, const GrAppliedClip* bClip,
                            const DstProxy* bDstTexture, const GrCaps&);
 
-    GrClearOp*                     fLastFullClearOp = nullptr;
-
     std::unique_ptr<gr_instanced::InstancedRendering> fInstancedRendering;
 
     uint32_t                       fLastClipStackGenID;