remove goto in Distance field path renderer

src/gpu/GrAADistanceFieldPathRenderer.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAADistanceFieldPathRenderer.h"
 
@@ skipping 132 matching lines @@
         }
     }
 
     // use signed distance field to render
     return this->internalDrawPath(target, pipelineBuilder, color, viewMatrix, path, pathData);
 }
 
 // padding around path bounds to allow for antialiased pixels
 const SkScalar kAntiAliasPad = 1.0f;
 
+inline bool GrAADistanceFieldPathRenderer::uploadPath(GrPlot** plot, SkIPoint16* atlasLocation,
+                                                      int width, int height, void* dfStorage) {
+    *plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage, atlasLocation);
+
+    // if atlas full
+    if (NULL == *plot) {
+        if (this->freeUnusedPlot()) {
+            *plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage, atlasLocation);
+            if (*plot) {
+                return true;
+            }
+        }
+
+        if (c_DumpPathCache) {
+#ifdef SK_DEVELOPER
+            GrTexture* texture = fAtlas->getTexture();
+            texture->surfacePriv().savePixels("pathcache.png");
+#endif
+        }
+
+        // before we purge the cache, we must flush any accumulated draws
+        fContext->flush();
+
+        if (this->freeUnusedPlot()) {
+            *plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage, atlasLocation);
+            if (*plot) {
+                return true;
+            }
+        }
+        return false;
+    }
+    return true;
+}
+
 GrAADistanceFieldPathRenderer::PathData* GrAADistanceFieldPathRenderer::addPathToAtlas(
                                                                         const SkPath& path,
                                                                         const SkStrokeRec& stroke,
                                                                         bool antiAlias,
                                                                         uint32_t dimension,
                                                                         SkScalar scale) {
 
     // generate distance field and add to atlas
     if (NULL == fAtlas) {
         SkISize textureSize = SkISize::Make(ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT);
@@ skipping 39 matching lines @@
     helper.draw(path, stroke, SkRegion::kReplace_Op, antiAlias, 0xFF);
     
     // generate signed distance field
     devPathBounds.outset(SK_DistanceFieldPad, SK_DistanceFieldPad);
     int width = devPathBounds.width();
     int height = devPathBounds.height();
     SkAutoSMalloc<1024> dfStorage(width*height*sizeof(unsigned char));
     helper.toSDF((unsigned char*) dfStorage.get());
     
     // add to atlas
+    GrPlot* plot;
     SkIPoint16  atlasLocation;
-    GrPlot* plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage.get(),
-                                      &atlasLocation);
-    
-    // if atlas full
-    if (NULL == plot) {
-        if (this->freeUnusedPlot()) {
-            plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage.get(),
-                                      &atlasLocation);
-            if (plot) {
-                goto HAS_ATLAS;
-            }
-        }
-    
-        if (c_DumpPathCache) {
-#ifdef SK_DEVELOPER
-            GrTexture* texture = fAtlas->getTexture();
-            texture->surfacePriv().savePixels("pathcache.png");
-#endif
-        }
-        
-        // before we purge the cache, we must flush any accumulated draws
-        fContext->flush();
-        
-        if (this->freeUnusedPlot()) {
-            plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage.get(),
-                                      &atlasLocation);
-            if (plot) {
-                goto HAS_ATLAS;
-            }
-        }
-            
+    if (!this->uploadPath(&plot, &atlasLocation, width, height, dfStorage.get())) {

[jvanverth1, 2015/02/11 18:14:20]

I think this should be okay -- but I would test on Nexus 7 to make sure it's not
overoptimized (see the similar code in GrDistanceFieldTextContext).

         return NULL;
     }
-    
-HAS_ATLAS:
+
     // add to cache
     PathData* pathData = SkNEW(PathData);
     pathData->fKey.fGenID = path.getGenerationID();
     pathData->fKey.fDimension = dimension;
     pathData->fScale = scale;
     pathData->fPlot = plot;
     // change the scaled rect to match the size of the inset distance field
     scaledBounds.fRight = scaledBounds.fLeft +
         SkIntToScalar(devPathBounds.width() - 2*SK_DistanceFieldInset);
     scaledBounds.fBottom = scaledBounds.fTop +
@@ skipping 116 matching lines @@
     
     viewMatrix.mapRect(&r);
     target->setIndexSourceToBuffer(fContext->getQuadIndexBuffer());
     target->drawIndexedInstances(pipelineBuilder, fCachedGeometryProcessor.get(),
                                  kTriangles_GrPrimitiveType, 1, 4, 6, &r);
     target->resetVertexSource();
     
     return true;
 }