joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright 2015 Google Inc. |
| 3 | * |
| 4 | * Use of this source code is governed by a BSD-style license that can be |
| 5 | * found in the LICENSE file. |
| 6 | */ |
| 7 | |
Brian Salomon | 903da79 | 2016-12-16 14:24:46 -0500 | [diff] [blame] | 8 | #include "GrDrawOpAtlas.h" |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 9 | |
| 10 | #include "GrContext.h" |
Brian Salomon | 742e31d | 2016-12-07 17:06:19 -0500 | [diff] [blame] | 11 | #include "GrOpFlushState.h" |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 12 | #include "GrRectanizer.h" |
| 13 | #include "GrTracing.h" |
| 14 | |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 15 | //////////////////////////////////////////////////////////////////////////////// |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 16 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 17 | GrDrawOpAtlas::Plot::Plot(int index, uint64_t genID, int offX, int offY, int width, int height, |
| 18 | GrPixelConfig config) |
| 19 | : fLastUpload(GrDrawOpUploadToken::AlreadyFlushedToken()) |
| 20 | , fLastUse(GrDrawOpUploadToken::AlreadyFlushedToken()) |
| 21 | , fIndex(index) |
| 22 | , fGenID(genID) |
| 23 | , fID(CreateId(fIndex, fGenID)) |
| 24 | , fData(nullptr) |
| 25 | , fWidth(width) |
| 26 | , fHeight(height) |
| 27 | , fX(offX) |
| 28 | , fY(offY) |
| 29 | , fRects(nullptr) |
| 30 | , fOffset(SkIPoint16::Make(fX * fWidth, fY * fHeight)) |
| 31 | , fConfig(config) |
| 32 | , fBytesPerPixel(GrBytesPerPixel(config)) |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 33 | #ifdef SK_DEBUG |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 34 | , fDirty(false) |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 35 | #endif |
| 36 | { |
| 37 | fDirtyRect.setEmpty(); |
| 38 | } |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 39 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 40 | GrDrawOpAtlas::Plot::~Plot() { |
jvanverth | c3d706f | 2016-04-20 10:33:27 -0700 | [diff] [blame] | 41 | sk_free(fData); |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 42 | delete fRects; |
| 43 | } |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 44 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 45 | bool GrDrawOpAtlas::Plot::addSubImage(int width, int height, const void* image, SkIPoint16* loc) { |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 46 | SkASSERT(width <= fWidth && height <= fHeight); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 47 | |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 48 | if (!fRects) { |
| 49 | fRects = GrRectanizer::Factory(fWidth, fHeight); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 50 | } |
| 51 | |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 52 | if (!fRects->addRect(width, height, loc)) { |
| 53 | return false; |
joshualitt | b4c507e | 2015-04-08 08:07:59 -0700 | [diff] [blame] | 54 | } |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 55 | |
jvanverth | c3d706f | 2016-04-20 10:33:27 -0700 | [diff] [blame] | 56 | if (!fData) { |
| 57 | fData = reinterpret_cast<unsigned char*>(sk_calloc_throw(fBytesPerPixel * fWidth * |
| 58 | fHeight)); |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 59 | } |
| 60 | size_t rowBytes = width * fBytesPerPixel; |
| 61 | const unsigned char* imagePtr = (const unsigned char*)image; |
| 62 | // point ourselves at the right starting spot |
jvanverth | c3d706f | 2016-04-20 10:33:27 -0700 | [diff] [blame] | 63 | unsigned char* dataPtr = fData; |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 64 | dataPtr += fBytesPerPixel * fWidth * loc->fY; |
| 65 | dataPtr += fBytesPerPixel * loc->fX; |
Brian Osman | cce3e58 | 2016-10-14 11:42:20 -0400 | [diff] [blame] | 66 | // copy into the data buffer, swizzling as we go if this is ARGB data |
| 67 | if (4 == fBytesPerPixel && kSkia8888_GrPixelConfig == kBGRA_8888_GrPixelConfig) { |
| 68 | for (int i = 0; i < height; ++i) { |
| 69 | SkOpts::RGBA_to_BGRA(reinterpret_cast<uint32_t*>(dataPtr), imagePtr, width); |
| 70 | dataPtr += fBytesPerPixel * fWidth; |
| 71 | imagePtr += rowBytes; |
| 72 | } |
| 73 | } else { |
| 74 | for (int i = 0; i < height; ++i) { |
| 75 | memcpy(dataPtr, imagePtr, rowBytes); |
| 76 | dataPtr += fBytesPerPixel * fWidth; |
| 77 | imagePtr += rowBytes; |
| 78 | } |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 79 | } |
| 80 | |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 81 | fDirtyRect.join(loc->fX, loc->fY, loc->fX + width, loc->fY + height); |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 82 | |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 83 | loc->fX += fOffset.fX; |
| 84 | loc->fY += fOffset.fY; |
| 85 | SkDEBUGCODE(fDirty = true;) |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 86 | |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 87 | return true; |
| 88 | } |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 89 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 90 | void GrDrawOpAtlas::Plot::uploadToTexture(GrDrawOp::WritePixelsFn& writePixels, |
| 91 | GrTexture* texture) { |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 92 | // We should only be issuing uploads if we are in fact dirty |
jvanverth | c3d706f | 2016-04-20 10:33:27 -0700 | [diff] [blame] | 93 | SkASSERT(fDirty && fData && texture); |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 94 | TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "GrDrawOpAtlas::Plot::uploadToTexture"); |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 95 | size_t rowBytes = fBytesPerPixel * fWidth; |
jvanverth | c3d706f | 2016-04-20 10:33:27 -0700 | [diff] [blame] | 96 | const unsigned char* dataPtr = fData; |
| 97 | dataPtr += rowBytes * fDirtyRect.fTop; |
| 98 | dataPtr += fBytesPerPixel * fDirtyRect.fLeft; |
| 99 | writePixels(texture, fOffset.fX + fDirtyRect.fLeft, fOffset.fY + fDirtyRect.fTop, |
| 100 | fDirtyRect.width(), fDirtyRect.height(), fConfig, dataPtr, rowBytes); |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 101 | fDirtyRect.setEmpty(); |
| 102 | SkDEBUGCODE(fDirty = false;) |
| 103 | } |
| 104 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 105 | void GrDrawOpAtlas::Plot::resetRects() { |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 106 | if (fRects) { |
| 107 | fRects->reset(); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 108 | } |
| 109 | |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 110 | fGenID++; |
| 111 | fID = CreateId(fIndex, fGenID); |
| 112 | |
| 113 | // zero out the plot |
jvanverth | c3d706f | 2016-04-20 10:33:27 -0700 | [diff] [blame] | 114 | if (fData) { |
| 115 | sk_bzero(fData, fBytesPerPixel * fWidth * fHeight); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 116 | } |
| 117 | |
joshualitt | 5df175e | 2015-11-18 13:37:54 -0800 | [diff] [blame] | 118 | fDirtyRect.setEmpty(); |
| 119 | SkDEBUGCODE(fDirty = false;) |
| 120 | } |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 121 | |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 122 | /////////////////////////////////////////////////////////////////////////////// |
| 123 | |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 124 | GrDrawOpAtlas::GrDrawOpAtlas(GrContext* context, sk_sp<GrTextureProxy> proxy, |
| 125 | int numPlotsX, int numPlotsY) |
| 126 | : fContext(context) |
| 127 | , fProxy(std::move(proxy)) |
| 128 | , fAtlasGeneration(kInvalidAtlasGeneration + 1) { |
| 129 | fPlotWidth = fProxy->width() / numPlotsX; |
| 130 | fPlotHeight = fProxy->height() / numPlotsY; |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 131 | SkASSERT(numPlotsX * numPlotsY <= BulkUseTokenUpdater::kMaxPlots); |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 132 | SkASSERT(fPlotWidth * numPlotsX == fProxy->width()); |
| 133 | SkASSERT(fPlotHeight * numPlotsY == fProxy->height()); |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 134 | |
| 135 | SkDEBUGCODE(fNumPlots = numPlotsX * numPlotsY;) |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 136 | |
| 137 | // We currently do not support compressed atlases... |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 138 | SkASSERT(!GrPixelConfigIsCompressed(fProxy->desc().fConfig)); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 139 | |
| 140 | // set up allocated plots |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 141 | fPlotArray.reset(new sk_sp<Plot>[ numPlotsX * numPlotsY ]); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 142 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 143 | sk_sp<Plot>* currPlot = fPlotArray.get(); |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 144 | for (int y = numPlotsY - 1, r = 0; y >= 0; --y, ++r) { |
| 145 | for (int x = numPlotsX - 1, c = 0; x >= 0; --x, ++c) { |
| 146 | uint32_t index = r * numPlotsX + c; |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 147 | currPlot->reset( |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 148 | new Plot(index, 1, x, y, fPlotWidth, fPlotHeight, fProxy->desc().fConfig)); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 149 | |
| 150 | // build LRU list |
| 151 | fPlotList.addToHead(currPlot->get()); |
| 152 | ++currPlot; |
| 153 | } |
| 154 | } |
| 155 | } |
| 156 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 157 | void GrDrawOpAtlas::processEviction(AtlasID id) { |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 158 | for (int i = 0; i < fEvictionCallbacks.count(); i++) { |
| 159 | (*fEvictionCallbacks[i].fFunc)(id, fEvictionCallbacks[i].fData); |
| 160 | } |
| 161 | } |
| 162 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 163 | inline void GrDrawOpAtlas::updatePlot(GrDrawOp::Target* target, AtlasID* id, Plot* plot) { |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 164 | this->makeMRU(plot); |
| 165 | |
| 166 | // If our most recent upload has already occurred then we have to insert a new |
| 167 | // upload. Otherwise, we already have a scheduled upload that hasn't yet ocurred. |
| 168 | // This new update will piggy back on that previously scheduled update. |
bsalomon | 342bfc2 | 2016-04-01 06:06:20 -0700 | [diff] [blame] | 169 | if (target->hasDrawBeenFlushed(plot->lastUploadToken())) { |
jvanverth | c3d706f | 2016-04-20 10:33:27 -0700 | [diff] [blame] | 170 | // With c+14 we could move sk_sp into lamba to only ref once. |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 171 | sk_sp<Plot> plotsp(SkRef(plot)); |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 172 | // MDB TODO: this is currently fine since the atlas' proxy is always pre-instantiated. |
| 173 | // Once it is deferred more care must be taken upon instantiation failure. |
| 174 | GrTexture* texture = fProxy->instantiate(fContext->textureProvider()); |
| 175 | if (texture) { |
| 176 | GrDrawOpUploadToken lastUploadToken = target->addAsapUpload( |
| 177 | [plotsp, texture] (GrDrawOp::WritePixelsFn& writePixels) { |
| 178 | plotsp->uploadToTexture(writePixels, texture); |
| 179 | } |
| 180 | ); |
| 181 | plot->setLastUploadToken(lastUploadToken); |
| 182 | } |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 183 | } |
| 184 | *id = plot->id(); |
| 185 | } |
| 186 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 187 | bool GrDrawOpAtlas::addToAtlas(AtlasID* id, GrDrawOp::Target* target, int width, int height, |
| 188 | const void* image, SkIPoint16* loc) { |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 189 | // We should already have a texture, TODO clean this up |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 190 | SkASSERT(fProxy); |
bsalomon | 6d6b6ad | 2016-07-13 14:45:28 -0700 | [diff] [blame] | 191 | if (width > fPlotWidth || height > fPlotHeight) { |
| 192 | return false; |
| 193 | } |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 194 | |
| 195 | // now look through all allocated plots for one we can share, in Most Recently Refed order |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 196 | PlotList::Iter plotIter; |
| 197 | plotIter.init(fPlotList, PlotList::Iter::kHead_IterStart); |
| 198 | Plot* plot; |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 199 | while ((plot = plotIter.get())) { |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 200 | SkASSERT(GrBytesPerPixel(fProxy->desc().fConfig) == plot->bpp()); |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 201 | if (plot->addSubImage(width, height, image, loc)) { |
bsalomon | 342bfc2 | 2016-04-01 06:06:20 -0700 | [diff] [blame] | 202 | this->updatePlot(target, id, plot); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 203 | return true; |
| 204 | } |
| 205 | plotIter.next(); |
| 206 | } |
| 207 | |
| 208 | // If the above fails, then see if the least recently refed plot has already been flushed to the |
| 209 | // gpu |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 210 | plot = fPlotList.tail(); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 211 | SkASSERT(plot); |
bsalomon | 342bfc2 | 2016-04-01 06:06:20 -0700 | [diff] [blame] | 212 | if (target->hasDrawBeenFlushed(plot->lastUseToken())) { |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 213 | this->processEviction(plot->id()); |
| 214 | plot->resetRects(); |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 215 | SkASSERT(GrBytesPerPixel(fProxy->desc().fConfig) == plot->bpp()); |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 216 | SkDEBUGCODE(bool verify = )plot->addSubImage(width, height, image, loc); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 217 | SkASSERT(verify); |
bsalomon | 342bfc2 | 2016-04-01 06:06:20 -0700 | [diff] [blame] | 218 | this->updatePlot(target, id, plot); |
joshualitt | 7c3a2f8 | 2015-03-31 13:32:05 -0700 | [diff] [blame] | 219 | fAtlasGeneration++; |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 220 | return true; |
| 221 | } |
| 222 | |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 223 | // If this plot has been used in a draw that is currently being prepared by an op, then we have |
| 224 | // to fail. This gives the op a chance to enqueue the draw, and call back into this function. |
| 225 | // When that draw is enqueued, the draw token advances, and the subsequent call will continue |
| 226 | // past this branch and prepare an inline upload that will occur after the enqueued draw which |
| 227 | // references the plot's pre-upload content. |
bsalomon | 342bfc2 | 2016-04-01 06:06:20 -0700 | [diff] [blame] | 228 | if (plot->lastUseToken() == target->nextDrawToken()) { |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 229 | return false; |
| 230 | } |
| 231 | |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 232 | this->processEviction(plot->id()); |
| 233 | fPlotList.remove(plot); |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 234 | sk_sp<Plot>& newPlot = fPlotArray[plot->index()]; |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 235 | newPlot.reset(plot->clone()); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 236 | |
| 237 | fPlotList.addToHead(newPlot.get()); |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 238 | SkASSERT(GrBytesPerPixel(fProxy->desc().fConfig) == newPlot->bpp()); |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 239 | SkDEBUGCODE(bool verify = )newPlot->addSubImage(width, height, image, loc); |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 240 | SkASSERT(verify); |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 241 | |
robertphillips | 1f0e350 | 2015-11-10 10:19:50 -0800 | [diff] [blame] | 242 | // Note that this plot will be uploaded inline with the draws whereas the |
| 243 | // one it displaced most likely was uploaded asap. |
Brian Salomon | 2ee084e | 2016-12-16 18:59:19 -0500 | [diff] [blame] | 244 | // With c+14 we could move sk_sp into lambda to only ref once. |
| 245 | sk_sp<Plot> plotsp(SkRef(newPlot.get())); |
Robert Phillips | 32f2818 | 2017-02-28 16:20:03 -0500 | [diff] [blame^] | 246 | // MDB TODO: this is currently fine since the atlas' proxy is always pre-instantiated. |
| 247 | // Once it is deferred more care must be taken upon instantiation failure. |
| 248 | GrTexture* texture = fProxy->instantiate(fContext->textureProvider()); |
| 249 | if (texture) { |
| 250 | GrDrawOpUploadToken lastUploadToken = target->addInlineUpload( |
| 251 | [plotsp, texture] (GrDrawOp::WritePixelsFn& writePixels) { |
| 252 | plotsp->uploadToTexture(writePixels, texture); |
| 253 | } |
| 254 | ); |
| 255 | newPlot->setLastUploadToken(lastUploadToken); |
| 256 | } |
bsalomon | 342bfc2 | 2016-04-01 06:06:20 -0700 | [diff] [blame] | 257 | |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 258 | *id = newPlot->id(); |
robertphillips | 2b0536f | 2015-11-06 14:10:42 -0800 | [diff] [blame] | 259 | |
joshualitt | 7c3a2f8 | 2015-03-31 13:32:05 -0700 | [diff] [blame] | 260 | fAtlasGeneration++; |
joshualitt | 5bf99f1 | 2015-03-13 11:47:42 -0700 | [diff] [blame] | 261 | return true; |
| 262 | } |