diff options
author | 2015-08-17 12:55:38 -0700 | |
---|---|---|
committer | 2015-08-17 12:55:38 -0700 | |
commit | 7539856c1b9cbb1886a6a498cc534b77fc83ddb2 (patch) | |
tree | d56158986f7db1a81d2a7b9a791332665094befc /src/gpu/GrBatchFontCache.h | |
parent | 1a899c9d547e5f12505e5bf654e4fb8b7dda0669 (diff) |
Make GrVertexBatch objects hold their own draws during GrDrawTarget flush
NO_MERGE_BUILDS
Review URL: https://codereview.chromium.org/1286043004
Diffstat (limited to 'src/gpu/GrBatchFontCache.h')
-rw-r--r-- | src/gpu/GrBatchFontCache.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gpu/GrBatchFontCache.h b/src/gpu/GrBatchFontCache.h index 998c220e8a..f315a3eb77 100644 --- a/src/gpu/GrBatchFontCache.h +++ b/src/gpu/GrBatchFontCache.h @@ -16,7 +16,6 @@ #include "SkVarAlloc.h" class GrBatchFontCache; -class GrBatchTarget; class GrGpu; /** @@ -59,7 +58,7 @@ public: // happen. // TODO we can handle some of these cases if we really want to, but the long term solution is to // get the actual glyph image itself when we get the glyph metrics. - bool addGlyphToAtlas(GrBatchTarget*, GrGlyph*, GrFontScaler*, const SkGlyph&, + bool addGlyphToAtlas(GrDrawBatch::Target*, GrGlyph*, GrFontScaler*, const SkGlyph&, GrMaskFormat expectedMaskFormat); // testing @@ -134,30 +133,30 @@ public: } // To ensure the GrBatchAtlas does not evict the Glyph Mask from its texture backing store, - // the client must pass in the currentToken from the GrBatchTarget along with the GrGlyph. + // the client must pass in the current batch token along with the GrGlyph. // A BulkUseTokenUpdater is used to manage bulk last use token updating in the Atlas. // For convenience, this function will also set the use token for the current glyph if required // NOTE: the bulk uploader is only valid if the subrun has a valid atlasGeneration void addGlyphToBulkAndSetUseToken(GrBatchAtlas::BulkUseTokenUpdater* updater, - GrGlyph* glyph, GrBatchAtlas::BatchToken token) { + GrGlyph* glyph, GrBatchToken token) { SkASSERT(glyph); updater->add(glyph->fID); this->getAtlas(glyph->fMaskFormat)->setLastUseToken(glyph->fID, token); } void setUseTokenBulk(const GrBatchAtlas::BulkUseTokenUpdater& updater, - GrBatchAtlas::BatchToken token, + GrBatchToken token, GrMaskFormat format) { this->getAtlas(format)->setLastUseTokenBulk(updater, token); } // add to texture atlas that matches this format bool addToAtlas(GrBatchTextStrike* strike, GrBatchAtlas::AtlasID* id, - GrBatchTarget* batchTarget, + GrDrawBatch::Target* target, GrMaskFormat format, int width, int height, const void* image, SkIPoint16* loc) { fPreserveStrike = strike; - return this->getAtlas(format)->addToAtlas(id, batchTarget, width, height, image, loc); + return this->getAtlas(format)->addToAtlas(id, target, width, height, image, loc); } // Some clients may wish to verify the integrity of the texture backing store of the |