Devirtualized token management in GrDeferredUploadTarget.

Change-Id: I7bef9d532f19056b5581e24e95949d1d32e8dd95
Reviewed-on: https://skia-review.googlesource.com/65505
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

1 files changed, 8 insertions, 10 deletions

diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h
index bc3986616d..947fd14b17 100644
--- a/src/gpu/GrOpFlushState.h
+++ b/src/gpu/GrOpFlushState.h
@@ -68,12 +68,6 @@ public:
 
     ~GrOpFlushState() final { this->reset(); }
 
-    /** Issue a token to an operation that is being enqueued. */
-    GrDeferredUploadToken issueDrawToken() { return ++fLastIssuedToken; }
-
-    /** Call every time a draw that was issued a token is flushed */
-    void flushToken() { ++fLastFlushedToken; }
-
     /** This is called after each op has a chance to prepare its draws and before the draws are
         issued. */
     void preIssueDraws() {
@@ -121,12 +115,18 @@ public:
         return *fOpArgs;
     }
 
+    /** Expose base class methods for incrementing the last flushed and next draw token. */
+
+    void flushToken() { this->GrDeferredUploadTarget::flushToken(); }
+
+    GrDeferredUploadToken issueDrawToken() {
+        return this->GrDeferredUploadTarget::issueDrawToken();
+    }
+
     /** Overrides of GrDeferredUploadTarget. */
 
     GrDeferredUploadToken addInlineUpload(GrDeferredTextureUploadFn&&) final;
     GrDeferredUploadToken addASAPUpload(GrDeferredTextureUploadFn&&) final;
-    GrDeferredUploadToken nextDrawToken() const final { return fLastIssuedToken.next(); }
-    GrDeferredUploadToken nextTokenToFlush() const override { return fLastFlushedToken.next(); }
 
     /** Overrides of GrMeshDrawOp::Target. */
 
@@ -157,8 +157,6 @@ private:
     GrVertexBufferAllocPool fVertexPool;
     GrIndexBufferAllocPool fIndexPool;
     SkSTArray<4, GrDeferredTextureUploadFn> fASAPUploads;
-    GrDeferredUploadToken fLastIssuedToken;
-    GrDeferredUploadToken fLastFlushedToken;
     OpArgs* fOpArgs;
     SkArenaAlloc fPipelines{sizeof(GrPipeline) * 100};
 };