Create append methods in batch namespaces

src/gpu/batches/GrTInstanceBatch.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 GrTInstanceBatch_DEFINED
 #define GrTInstanceBatch_DEFINED
 
 #include "GrVertexBatch.h"
 
 #include "GrBatchFlushState.h"
 
 /**
  * GrTInstanceBatch is an optional template to help with writing batches
  * To use this template, The 'Impl' must define the following statics:
  *     A Geometry struct
  *
  *     static const int kVertsPerInstance
  *     static const int kIndicesPerInstance
  *
  *     const char* Name()
  *
  *     void InvariantOutputCoverage(GrInitInvariantOutput* out)
  *
  *     void SetBounds(const Geometry& seedGeometry, SkRect* outBounds)
  *

[robertphillips, 2015/09/18 17:42:26]

UpdateBoundsForAppend ?

[joshualitt, 2015/09/18 18:34:10]

Acknowledged.

+ *     void UpdateBounds(const Geometry& lastGeometry, SkRect* currentBounds)
+ *
  *     bool CanCombine(const Geometry& mine, const Geometry& theirs,
  *                     const GrPipelineOptimizations&)
  *
  *     const GrGeometryProcessor* CreateGP(const Geometry& seedGeometry,
  *                                         const GrPipelineOptimizations& opts)
  *
  *     const GrIndexBuffer* GetIndexBuffer(GrResourceProvider*)
  *
  *     Tesselate(intptr_t vertices, size_t vertexStride, const Geometry& geo,
  *               const GrPipelineOptimizations& opts)
@@ skipping 18 matching lines @@
         Impl::InitInvariantOutputCoverage(out);
     }
 
     void initBatchTracker(const GrPipelineOptimizations& opt) override {
         opt.getOverrideColorIfSet(&fGeoData[0].fColor);
         fOpts = opt;
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
-    // to avoid even the initial copy of the struct, we have a getter for the first item which
-    // is used to seed the batch with its initial geometry.  After seeding, the client should call
-    // init() so the Batch can initialize itself
-    Geometry* geometry() { return &fGeoData[0]; }
+    // After seeding, the client should call init() so the Batch can initialize itself
     void init() {
         const Geometry& geo = fGeoData[0];
         Impl::SetBounds(geo, &fBounds);
     }
 

[robertphillips, 2015/09/18 17:42:26]

updateBoundsAfterAppend ?
updateBoundsForAppend ?

[joshualitt, 2015/09/18 18:34:11]

Acknowledged.

+    void updateBounds() {
+        const Geometry& geo = fGeoData.back();
+        Impl::UpdateBounds(geo, &fBounds);
+    }
+
 private:
-    GrTInstanceBatch() : INHERITED(ClassID()) {
-        // Push back an initial geometry
-        fGeoData.push_back();
-    }
+    GrTInstanceBatch() : INHERITED(ClassID()) {}
 
     void onPrepareDraws(Target* target) override {
         SkAutoTUnref<const GrGeometryProcessor> gp(Impl::CreateGP(this->seedGeometry(), fOpts));
         if (!gp) {
             SkDebugf("Couldn't create GrGeometryProcessor\n");
             return;
         }
 
         target->initDraw(gp, this->pipeline());
 
@@ skipping 43 matching lines @@
         return true;
     }
 
     GrPipelineOptimizations fOpts;
     SkSTArray<1, Geometry, true> fGeoData;
 
     typedef GrVertexBatch INHERITED;
 };
 
 #endif