Reduce texture uploads for font atlas.

src/gpu/GrAtlas.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlas.h"
 #include "GrContext.h"
 #include "GrGpu.h"
 #include "GrRectanizer.h"
+#include "GrTracing.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // for testing
 #define FONT_CACHE_STATS 0
 #if FONT_CACHE_STATS
 static int g_UploadCount = 0;
 #endif
 
 GrPlot::GrPlot() : fDrawToken(NULL, 0)
@@ skipping 60 matching lines @@
             imagePtr += fBytesPerPixel*width;
         }
 
         fDirtyRect.join(loc->fX, loc->fY, loc->fX + width, loc->fY + height);
         adjust_for_offset(loc, fOffset);
         fDirty = true;
     // otherwise, just upload the image directly
     } else {
         adjust_for_offset(loc, fOffset);
         GrContext* context = fTexture->getContext();
+        TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "GrPlot::uploadToTexture");
         context->writeTexturePixels(fTexture,
                                     loc->fX, loc->fY, width, height,
                                     fTexture->config(), image, 0,
                                     GrContext::kDontFlush_PixelOpsFlag);
     }
 
 #if FONT_CACHE_STATS
     ++g_UploadCount;
 #endif
 
     return true;
 }
 
 void GrPlot::uploadToTexture() {
     static const float kNearlyFullTolerance = 0.85f;
 
     // should only do this if batching is enabled
     SkASSERT(fBatchUploads);
 
     if (fDirty) {
+        TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "GrPlot::uploadToTexture");
         SkASSERT(NULL != fTexture);
         GrContext* context = fTexture->getContext();
         // We pass the flag that does not force a flush. We assume our caller is
         // smart and hasn't referenced the part of the texture we're about to update
         // since the last flush.
-        int rowBytes = fBytesPerPixel*fRects->width();
+        size_t rowBytes = fBytesPerPixel*fRects->width();
         const unsigned char* dataPtr = fPlotData;
         dataPtr += rowBytes*fDirtyRect.fTop;
         dataPtr += fBytesPerPixel*fDirtyRect.fLeft;
         context->writeTexturePixels(fTexture,
                                     fOffset.fX + fDirtyRect.fLeft, fOffset.fY + fDirtyRect.fTop,
                                     fDirtyRect.width(), fDirtyRect.height(),
                                     fTexture->config(), dataPtr,
                                     rowBytes,
                                     GrContext::kDontFlush_PixelOpsFlag);
         fDirtyRect.setEmpty();
@@ skipping 152 matching lines @@
     if (fBatchUploads) {
         GrPlotList::Iter plotIter;
         plotIter.init(fPlotList, GrPlotList::Iter::kHead_IterStart);
         GrPlot* plot;
         while (NULL != (plot = plotIter.get())) {
             plot->uploadToTexture();
             plotIter.next();
         }
     }
 }