AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move the exit code to a common switch

Browse Source 
Clean up the control flow, to try to see the invariants more clearly.

Change-Id: Ie07090950650166e99dff334e85189fe581a5efe
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262235
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Herb Derby 2020-01-06 13:44:29 -05:00 committed by Skia Commit-Bot
parent 8783b78b38
commit 83b907ef4f
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/gpu/text/GrTextBlob.cpp
View File

@ -913,26 +913,18 @@ bool GrTextBlob::VertexRegenerator::doRegen(GrTextBlob::VertexRegenerator::Resul
glyphLimit = fCurrGlyph + maxGlyphs;
result->fFinished = false;
}
auto code = GrDrawOpAtlas::ErrorCode::kSucceeded;
for (; fCurrGlyph < glyphLimit; fCurrGlyph++) {
if (fActions.regenTextureCoordinates) {
GrGlyph* glyph = fSubRun->fGlyphs[fCurrGlyph];
SkASSERT(glyph && glyph->fMaskFormat == fSubRun->maskFormat());
if (!fFullAtlasManager->hasGlyph(glyph)) {
GrDrawOpAtlas::ErrorCode code = grStrike->addGlyphToAtlas(
code = grStrike->addGlyphToAtlas(
fResourceProvider, fUploadTarget, fGrStrikeCache, fFullAtlasManager, glyph,
fMetricsAndImages.get(), fSubRun->maskFormat(), fSubRun->needsTransform());
if (GrDrawOpAtlas::ErrorCode::kError == code) {
// Something horrible has happened - drop the op
return false;
}
else if (GrDrawOpAtlas::ErrorCode::kTryAgain == code) {
// If fCurrGlyph == 0, then no glyphs from this SubRun were put into the atlas,
// otherwise at least one glyph made it into the atlas, and this run needs
// special handling because of the atlas flush in the middle of it.
fBrokenRun = fCurrGlyph > 0;
result->fFinished = false;
return true;
if (code != GrDrawOpAtlas::ErrorCode::kSucceeded) {
break;
}
}
auto tokenTracker = fUploadTarget->tokenTracker();
@ -948,17 +940,37 @@ bool GrTextBlob::VertexRegenerator::doRegen(GrTextBlob::VertexRegenerator::Resul
++result->fGlyphsRegenerated;
}
if (fActions.regenTextureCoordinates) {
fSubRun->fAtlasGeneration =
fBrokenRun ? GrDrawOpAtlas::kInvalidAtlasGeneration
: fFullAtlasManager->atlasGeneration(fSubRun->maskFormat());
} else {
// For the non-texCoords case we need to ensure that we update the associated use tokens
fFullAtlasManager->setUseTokenBulk(*fSubRun->bulkUseToken(),
fUploadTarget->tokenTracker()->nextDrawToken(),
fSubRun->maskFormat());
switch (code) {
case GrDrawOpAtlas::ErrorCode::kError: {
// Something horrible has happened - drop the op
return false;
}
case GrDrawOpAtlas::ErrorCode::kTryAgain: {
// If fCurrGlyph == 0, then no glyphs from this SubRun were put into the atlas,
// otherwise at least one glyph made it into the atlas, and this run needs
// special handling because of the atlas flush in the middle of it.
fBrokenRun = fCurrGlyph > 0;
result->fFinished = false;
return true;
}
case GrDrawOpAtlas::ErrorCode::kSucceeded: {
if (fActions.regenTextureCoordinates) {
fSubRun->fAtlasGeneration =
fBrokenRun ? GrDrawOpAtlas::kInvalidAtlasGeneration
: fFullAtlasManager->atlasGeneration(fSubRun->maskFormat());
} else {
// For the non-texCoords case we need to ensure that we update the associated
// use tokens
fFullAtlasManager->setUseTokenBulk(*fSubRun->bulkUseToken(),
fUploadTarget->tokenTracker()->nextDrawToken(),
fSubRun->maskFormat());
}
return true;
}
}
return true;
// Make some compilers happy because that can't figure out that the switch above is complete.
SkUNREACHABLE;
}
bool GrTextBlob::VertexRegenerator::regenerate(GrTextBlob::VertexRegenerator::Result* result,