Make GrBatch carry its own GrPipeline

src/gpu/batches/GrBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBatch_DEFINED
 #define GrBatch_DEFINED
 
@@ skipping 29 matching lines @@
 #if GR_BATCH_SPEW
     #define GrBATCH_INFO(...) SkDebugf(__VA_ARGS__)
     #define GrBATCH_SPEW(code) code
 #else
     #define GrBATCH_SPEW(code)
     #define GrBATCH_INFO(...)
 #endif
 
 class GrBatch : public GrNonAtomicRef {
 public:
-    GrBatch()
-        : fClassID(kIllegalBatchID)
-        , fNumberOfDraws(0)
-#if GR_BATCH_SPEW
-        , fUniqueID(GenID(&gCurrBatchUniqueID))
-#endif
-        { SkDEBUGCODE(fUsed = false;) }
-    virtual ~GrBatch() {}
+    GrBatch();
+    ~GrBatch() override;
 
     virtual const char* name() const = 0;
     virtual void getInvariantOutputColor(GrInitInvariantOutput* out) const = 0;
     virtual void getInvariantOutputCoverage(GrInitInvariantOutput* out) const = 0;
 
     bool combineIfPossible(GrBatch* that) {
         if (this->classID() != that->classID()) {
             return false;
         }
 
@@ skipping 26 matching lines @@
     template <typename T> const T& cast() const { return *static_cast<const T*>(this); }
     template <typename T> T* cast() { return static_cast<T*>(this); }
 
     uint32_t classID() const { SkASSERT(kIllegalBatchID != fClassID); return fClassID; }
 
     // TODO no GrPrimitiveProcessors yet read fragment position
     bool willReadFragmentPosition() const { return false; }
 
     SkDEBUGCODE(bool isUsed() const { return fUsed; })
 
-    const GrPipeline* pipeline() const { return fPipeline; }
+    const GrPipeline* pipeline() const {
+        SkASSERT(fPipelineInstalled);
+        return reinterpret_cast<const GrPipeline*>(fPipelineStorage.get());
+    }
 
-    void setPipeline(const GrPipeline* pipeline, const GrPipelineOptimizations& optimizations) {
-        fPipeline.reset(SkRef(pipeline));
-        this->initBatchTracker(optimizations);
-    }
+    bool installPipeline(const GrPipeline::CreateArgs&);
 
 #if GR_BATCH_SPEW
     uint32_t uniqueID() const { return fUniqueID; }
 #endif
 
 protected:
     template <typename PROC_SUBCLASS> void initClassID() {
          static uint32_t kClassID = GenID(&gCurrBatchClassID);
          fClassID = kClassID;
     }
@@ skipping 63 matching lines @@
         if (!id) {
             SkFAIL("This should never wrap as it should only be called once for each GrBatch "
                    "subclass.");
         }
         return id;
     }
 
     enum {
         kIllegalBatchID = 0,
     };
-    SkAutoTUnref<const GrPipeline> fPipeline;
+    SkAlignedSTStorage<1, GrPipeline>   fPipelineStorage;
+    int                                 fNumberOfDraws;
+    SkDEBUGCODE(bool                    fUsed;)
+    bool                                fPipelineInstalled;
+#if GR_BATCH_SPEW
+    uint32_t                            fUniqueID;
+    static int32_t gCurrBatchUniqueID;
+#endif
     static int32_t gCurrBatchClassID;
-    int fNumberOfDraws;
-    SkDEBUGCODE(bool fUsed;)
-#if GR_BATCH_SPEW
-    static int32_t gCurrBatchUniqueID;
-    uint32_t fUniqueID;
-#endif
-
     typedef SkRefCnt INHERITED;
 };
 
 #endif