diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-10-31 14:42:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-31 19:01:06 +0000 |
| commit | 29b60c9020ce4376df3d31db15d1aa316d640711 (patch) | |
| tree | 86748ea86ae5d10f62d1714e0423487ed4e43a4a /src/gpu/GrDrawOpAtlas.h | |
| parent | f78b55cb94f4ac89b76a26d5a56d6380aa8fea6b (diff) | |
Make deferred upload handling and draw recording be virtual interfaces implemented by GrOpFlushState.
The motivation for this is to allow other clients of GrDrawOpAtlas. Making GrMeshDrawOp::Target also be an abstract interface is somewhat incidental to this goal.
Bug: skia:
Change-Id: I0987adfa8a269aa2ca94147e933a2827d734c1cc
Reviewed-on: https://skia-review.googlesource.com/65121
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrDrawOpAtlas.h')
| -rw-r--r-- | src/gpu/GrDrawOpAtlas.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrDrawOpAtlas.h b/src/gpu/GrDrawOpAtlas.h index 694af30e00..91a88ecdba 100644 --- a/src/gpu/GrDrawOpAtlas.h +++ b/src/gpu/GrDrawOpAtlas.h @@ -29,7 +29,7 @@ struct GrDrawOpAtlasConfig { * This class manages one or more atlas textures on behalf of GrDrawOps. The draw ops that use the * atlas perform texture uploads when preparing their draws during flush. The class provides * facilities for using GrDrawOpUploadToken to detect data hazards. Op's uploads are performed in - * "asap" mode until it is impossible to add data without overwriting texels read by draws that + * "ASAP" mode until it is impossible to add data without overwriting texels read by draws that * have not yet executed on the gpu. At that point, the atlas will attempt to allocate a new * atlas texture (or "page") of the same size, up to a maximum number of textures, and upload * to that texture. If that's not possible, the uploads are performed "inline" between draws. If a @@ -100,7 +100,7 @@ public: * 'setUseToken' with the currentToken from the GrDrawOp::Target, otherwise the next call to * addToAtlas might cause the previous data to be overwritten before it has been read. */ - bool addToAtlas(AtlasID*, GrDrawOp::Target*, int width, int height, const void* image, + bool addToAtlas(AtlasID*, GrDeferredUploadTarget*, int width, int height, const void* image, SkIPoint16* loc); GrContext* context() const { return fContext; } @@ -327,7 +327,7 @@ private: return (id >> 16) & 0xffffffffffff; } - inline bool updatePlot(GrDrawOp::Target*, AtlasID*, Plot*); + inline bool updatePlot(GrDeferredUploadTarget*, AtlasID*, Plot*); inline void makeMRU(Plot* plot, int pageIdx) { if (fPages[pageIdx].fPlotList.head() == plot) { |