Refugee from Dead Machine 4: MDB Monster

src/gpu/GrBatchAtlas.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBatchAtlas.h"
 #include "GrBatchFlushState.h"
 #include "GrRectanizer.h"
@@ skipping 201 matching lines @@
     , fAtlasGeneration(kInvalidAtlasGeneration + 1) {
 
     int plotWidth = texture->width() / numPlotsX;
     int plotHeight = texture->height() / numPlotsY;
     SkASSERT(numPlotsX * numPlotsY <= BulkUseTokenUpdater::kMaxPlots);
     SkASSERT(plotWidth * numPlotsX == texture->width());
     SkASSERT(plotHeight * numPlotsY == texture->height());
 
     SkDEBUGCODE(fNumPlots = numPlotsX * numPlotsY;)
 
+    fTexture->setFromRawPixels(true);
+    fTexture->setException(true);
+
     // We currently do not support compressed atlases...
     SkASSERT(!GrPixelConfigIsCompressed(texture->desc().fConfig));
 
     // set up allocated plots
     fPlotArray = new SkAutoTUnref<BatchPlot>[numPlotsX * numPlotsY];
 
     SkAutoTUnref<BatchPlot>* currPlot = fPlotArray;
     for (int y = numPlotsY - 1, r = 0; y >= 0; --y, ++r) {
         for (int x = numPlotsX - 1, c = 0; x >= 0; --x, ++c) {
             uint32_t index = r * numPlotsX + c;
@@ skipping 73 matching lines @@
         fAtlasGeneration++;
         return true;
     }
 
     // The least recently used plot hasn't been flushed to the gpu yet, however, if we have flushed
     // it to the batch target than we can reuse it.  Our last use token is guaranteed to be less
     // than or equal to the current token.  If its 'less than' the current token, than we can spin
     // off the plot (ie let the batch target manage it) and create a new plot in its place in our
     // array.  If it is equal to the currentToken, then the caller has to flush draws to the batch
     // target so we can spin off the plot
-    if (plot->lastUseToken() == batchTarget->currentToken()) {
+    if (plot->lastUseToken() == batchTarget->currentToken1()) {
         return false;
     }
 
-    SkASSERT(plot->lastUseToken() < batchTarget->currentToken());
-    SkASSERT(!batchTarget->hasTokenBeenFlushed(batchTarget->currentToken()));
+    SkASSERT(plot->lastUseToken() < batchTarget->currentToken1());
+    SkASSERT(!batchTarget->hasTokenBeenFlushed(batchTarget->currentToken1()));
 
     SkASSERT(!plot->unique());  // The GrPlotUpdater should have a ref too
 
     this->processEviction(plot->id());
     fPlotList.remove(plot);
     SkAutoTUnref<BatchPlot>& newPlot = fPlotArray[plot->index()];
     newPlot.reset(plot->clone());
 
     fPlotList.addToHead(newPlot.get());
     SkASSERT(GrBytesPerPixel(fTexture->desc().fConfig) == newPlot->bpp());
     SkDEBUGCODE(bool verify = )newPlot->addSubImage(width, height, image, loc);
     SkASSERT(verify);
 
     // Note that this plot will be uploaded inline with the draws whereas the
     // one it displaced most likely was uploaded asap.
-    newPlot->setLastUploadToken(batchTarget->currentToken());
+    newPlot->setLastUploadToken(batchTarget->currentToken1());
     SkAutoTUnref<GrPlotUploader> uploader(new GrPlotUploader(newPlot, fTexture));
     batchTarget->upload(uploader);
     *id = newPlot->id();
 
     fAtlasGeneration++;
     return true;
 }
 
 bool GrBatchAtlas::hasID(AtlasID id) {
     uint32_t index = GetIndexFromID(id);
@@ skipping 11 matching lines @@
 
 void GrBatchAtlas::setLastUseTokenBulk(const BulkUseTokenUpdater& updater,
                                        GrBatchToken batchToken) {
     int count = updater.fPlotsToUpdate.count();
     for (int i = 0; i < count; i++) {
         BatchPlot* plot = fPlotArray[updater.fPlotsToUpdate[i]];
         this->makeMRU(plot);
         plot->setLastUseToken(batchToken);
     }
 }