Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Unified Diff: src/gpu/batches/GrTInstanceBatch.h

Issue 1345393003: Revert of add a ClassID function to GrBatch (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/batches/GrStrokeRectBatch.cpp ('k') | src/gpu/batches/GrTessellatingPathRenderer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/batches/GrTInstanceBatch.h
diff --git a/src/gpu/batches/GrTInstanceBatch.h b/src/gpu/batches/GrTInstanceBatch.h
index 014ec125fe6ae894d2a1317839046298b79615bb..e314959bfcd9c7d4ff0745ff336c2302f219f389 100644
--- a/src/gpu/batches/GrTInstanceBatch.h
+++ b/src/gpu/batches/GrTInstanceBatch.h
@@ -40,8 +40,6 @@
template <typename Impl>
class GrTInstanceBatch : public GrVertexBatch {
public:
- DEFINE_BATCH_CLASS_ID
-
typedef typename Impl::Geometry Geometry;
static GrTInstanceBatch* Create() { return new GrTInstanceBatch; }
@@ -74,7 +72,9 @@
}
private:
- GrTInstanceBatch() : INHERITED(ClassID()) {
+ GrTInstanceBatch() {
+ this->initClassID<GrTInstanceBatch<Impl>>();
+
// Push back an initial geometry
fGeoData.push_back();
}
@@ -136,8 +136,6 @@
GrPipelineOptimizations fOpts;
SkSTArray<1, Geometry, true> fGeoData;
-
- typedef GrVertexBatch INHERITED;
};
#endif
« no previous file with comments | « src/gpu/batches/GrStrokeRectBatch.cpp ('k') | src/gpu/batches/GrTessellatingPathRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698