small cleanup of GrAtlas

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)
-    , fID(-1)
+    : fID(-1)
     , fTexture(NULL)
     , fRects(NULL)
     , fAtlas(NULL)
     , fBytesPerPixel(1)
     , fDirty(false)
     , fBatchUploads(false)
 {
     fOffset.set(0, 0);
 }
 
@@ skipping 63 matching lines @@
         adjust_for_offset(loc, fOffset);
     }
 
 #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(fTexture);
-        // 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.
-        size_t rowBytes = fBytesPerPixel*fRects->width();
-        const unsigned char* dataPtr = fPlotData;
-        dataPtr += rowBytes*fDirtyRect.fTop;
-        dataPtr += fBytesPerPixel*fDirtyRect.fLeft;
-        fTexture->writePixels(fOffset.fX + fDirtyRect.fLeft, fOffset.fY + fDirtyRect.fTop,
-                              fDirtyRect.width(), fDirtyRect.height(), fTexture->config(), dataPtr,
-                              rowBytes, GrContext::kDontFlush_PixelOpsFlag);
-        fDirtyRect.setEmpty();
-        fDirty = false;
-        // If the Plot is nearly full, anything else we add will probably be small and one
-        // at a time, so free up the memory and after this upload any new images directly.
-        if (fRects->percentFull() > kNearlyFullTolerance) {
-            SkDELETE_ARRAY(fPlotData);
-            fPlotData = NULL;
-        }
-    }
-}
-
 void GrPlot::resetRects() {
     SkASSERT(fRects);
     fRects->reset();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrAtlas::GrAtlas(GrGpu* gpu, GrPixelConfig config, GrSurfaceFlags flags,
                  const SkISize& backingTextureSize,
                  int numPlotsX, int numPlotsY, bool batchUploads) {
@@ skipping 102 matching lines @@
     // If the above fails, then the current plot list has no room
     return NULL;
 }
 
 void GrAtlas::RemovePlot(ClientPlotUsage* usage, const GrPlot* plot) {
     int index = usage->fPlots.find(const_cast<GrPlot*>(plot));
     if (index >= 0) {
         usage->fPlots.remove(index);
     }
 }
-
-// get a plot that's not being used by the current draw
-GrPlot* GrAtlas::getUnusedPlot() {
-    GrPlotList::Iter plotIter;
-    plotIter.init(fPlotList, GrPlotList::Iter::kTail_IterStart);
-    GrPlot* plot;
-    while ((plot = plotIter.get())) {
-        if (plot->drawToken().isIssued()) {
-            return plot;
-        }
-        plotIter.prev();
-    }
-
-    return NULL;
-}
-
-void GrAtlas::uploadPlotsToTexture() {
-    if (fBatchUploads) {
-        GrPlotList::Iter plotIter;
-        plotIter.init(fPlotList, GrPlotList::Iter::kHead_IterStart);
-        GrPlot* plot;
-        while ((plot = plotIter.get())) {
-            plot->uploadToTexture();
-            plotIter.next();
-        }
-    }
-}