Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 1 | /* |
| 2 | * Copyright 2017 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 | |
| 8 | #include "GrResourceAllocator.h" |
| 9 | |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 10 | #include "GrGpuResourcePriv.h" |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 11 | #include "GrOpList.h" |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 12 | #include "GrRenderTargetProxy.h" |
| 13 | #include "GrResourceCache.h" |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 14 | #include "GrResourceProvider.h" |
| 15 | #include "GrSurfacePriv.h" |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 16 | #include "GrSurfaceProxy.h" |
| 17 | #include "GrSurfaceProxyPriv.h" |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 18 | #include "GrTextureProxy.h" |
Greg Daniel | 4684f82 | 2018-03-08 15:27:36 -0500 | [diff] [blame] | 19 | #include "GrUninstantiateProxyTracker.h" |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 20 | |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 21 | void GrResourceAllocator::Interval::assign(sk_sp<GrSurface> s) { |
| 22 | SkASSERT(!fAssignedSurface); |
| 23 | fAssignedSurface = s; |
| 24 | fProxy->priv().assign(std::move(s)); |
| 25 | } |
| 26 | |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 27 | |
| 28 | void GrResourceAllocator::markEndOfOpList(int opListIndex) { |
| 29 | SkASSERT(!fAssigned); // We shouldn't be adding any opLists after (or during) assignment |
| 30 | |
| 31 | SkASSERT(fEndOfOpListOpIndices.count() == opListIndex); |
| 32 | if (!fEndOfOpListOpIndices.empty()) { |
| 33 | SkASSERT(fEndOfOpListOpIndices.back() < this->curOp()); |
| 34 | } |
| 35 | |
| 36 | fEndOfOpListOpIndices.push_back(this->curOp()); // This is the first op index of the next opList |
| 37 | } |
| 38 | |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 39 | GrResourceAllocator::~GrResourceAllocator() { |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 40 | SkASSERT(fIntvlList.empty()); |
| 41 | SkASSERT(fActiveIntvls.empty()); |
| 42 | SkASSERT(!fIntvlHash.count()); |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 43 | } |
| 44 | |
Chris Dalton | 8816b93 | 2017-11-29 16:48:25 -0700 | [diff] [blame] | 45 | void GrResourceAllocator::addInterval(GrSurfaceProxy* proxy, unsigned int start, unsigned int end |
| 46 | SkDEBUGCODE(, bool isDirectDstRead)) { |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 47 | SkASSERT(start <= end); |
| 48 | SkASSERT(!fAssigned); // We shouldn't be adding any intervals after (or during) assignment |
| 49 | |
| 50 | if (Interval* intvl = fIntvlHash.find(proxy->uniqueID().asUInt())) { |
| 51 | // Revise the interval for an existing use |
Chris Dalton | 8816b93 | 2017-11-29 16:48:25 -0700 | [diff] [blame] | 52 | #ifdef SK_DEBUG |
Robert Phillips | 51b20f2 | 2017-12-01 15:32:35 -0500 | [diff] [blame] | 53 | if (0 == start && 0 == end) { |
| 54 | // This interval is for the initial upload to a deferred proxy. Due to the vagaries |
| 55 | // of how deferred proxies are collected they can appear as uploads multiple times in a |
| 56 | // single opLists' list and as uploads in several opLists. |
| 57 | SkASSERT(0 == intvl->start()); |
| 58 | } else if (isDirectDstRead) { |
Chris Dalton | 8816b93 | 2017-11-29 16:48:25 -0700 | [diff] [blame] | 59 | // Direct reads from the render target itself should occur w/in the existing interval |
| 60 | SkASSERT(intvl->start() <= start && intvl->end() >= end); |
| 61 | } else { |
| 62 | SkASSERT(intvl->end() <= start && intvl->end() <= end); |
| 63 | } |
| 64 | #endif |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 65 | intvl->extendEnd(end); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 66 | return; |
| 67 | } |
| 68 | |
Robert Phillips | 8186cbe | 2017-11-01 17:32:39 -0400 | [diff] [blame] | 69 | Interval* newIntvl; |
| 70 | if (fFreeIntervalList) { |
| 71 | newIntvl = fFreeIntervalList; |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 72 | fFreeIntervalList = newIntvl->next(); |
Robert Phillips | 8186cbe | 2017-11-01 17:32:39 -0400 | [diff] [blame] | 73 | newIntvl->resetTo(proxy, start, end); |
| 74 | } else { |
| 75 | newIntvl = fIntervalAllocator.make<Interval>(proxy, start, end); |
| 76 | } |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 77 | |
| 78 | fIntvlList.insertByIncreasingStart(newIntvl); |
| 79 | fIntvlHash.add(newIntvl); |
Chris Dalton | 706a6ff | 2017-11-29 22:01:06 -0700 | [diff] [blame] | 80 | |
Robert Phillips | 4150eea | 2018-02-07 17:08:21 -0500 | [diff] [blame] | 81 | if (!fResourceProvider->explicitlyAllocateGPUResources()) { |
| 82 | // FIXME: remove this once we can do the lazy instantiation from assign instead. |
| 83 | if (GrSurfaceProxy::LazyState::kNot != proxy->lazyInstantiationState()) { |
| 84 | proxy->priv().doLazyInstantiation(fResourceProvider); |
| 85 | } |
Chris Dalton | 706a6ff | 2017-11-29 22:01:06 -0700 | [diff] [blame] | 86 | } |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 87 | } |
| 88 | |
| 89 | GrResourceAllocator::Interval* GrResourceAllocator::IntervalList::popHead() { |
| 90 | Interval* temp = fHead; |
| 91 | if (temp) { |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 92 | fHead = temp->next(); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 93 | } |
| 94 | return temp; |
| 95 | } |
| 96 | |
| 97 | // TODO: fuse this with insertByIncreasingEnd |
| 98 | void GrResourceAllocator::IntervalList::insertByIncreasingStart(Interval* intvl) { |
| 99 | if (!fHead) { |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 100 | intvl->setNext(nullptr); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 101 | fHead = intvl; |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 102 | } else if (intvl->start() <= fHead->start()) { |
| 103 | intvl->setNext(fHead); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 104 | fHead = intvl; |
| 105 | } else { |
| 106 | Interval* prev = fHead; |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 107 | Interval* next = prev->next(); |
| 108 | for (; next && intvl->start() > next->start(); prev = next, next = next->next()) { |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 109 | } |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 110 | intvl->setNext(next); |
| 111 | prev->setNext(intvl); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 112 | } |
| 113 | } |
| 114 | |
| 115 | // TODO: fuse this with insertByIncreasingStart |
| 116 | void GrResourceAllocator::IntervalList::insertByIncreasingEnd(Interval* intvl) { |
| 117 | if (!fHead) { |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 118 | intvl->setNext(nullptr); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 119 | fHead = intvl; |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 120 | } else if (intvl->end() <= fHead->end()) { |
| 121 | intvl->setNext(fHead); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 122 | fHead = intvl; |
| 123 | } else { |
| 124 | Interval* prev = fHead; |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 125 | Interval* next = prev->next(); |
| 126 | for (; next && intvl->end() > next->end(); prev = next, next = next->next()) { |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 127 | } |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 128 | intvl->setNext(next); |
| 129 | prev->setNext(intvl); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 130 | } |
| 131 | } |
| 132 | |
Robert Phillips | 4150eea | 2018-02-07 17:08:21 -0500 | [diff] [blame] | 133 | |
| 134 | GrResourceAllocator::Interval* GrResourceAllocator::IntervalList::detachAll() { |
| 135 | Interval* tmp = fHead; |
| 136 | fHead = nullptr; |
| 137 | return tmp; |
| 138 | } |
| 139 | |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 140 | // 'surface' can be reused. Add it back to the free pool. |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 141 | void GrResourceAllocator::freeUpSurface(sk_sp<GrSurface> surface) { |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 142 | const GrScratchKey &key = surface->resourcePriv().getScratchKey(); |
| 143 | |
| 144 | if (!key.isValid()) { |
| 145 | return; // can't do it w/o a valid scratch key |
| 146 | } |
| 147 | |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 148 | if (surface->getUniqueKey().isValid()) { |
| 149 | // If the surface has a unique key we throw it back into the resource cache. |
| 150 | // If things get really tight 'findSurfaceFor' may pull it back out but there is |
| 151 | // no need to have it in tight rotation. |
| 152 | return; |
| 153 | } |
| 154 | |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 155 | // TODO: fix this insertion so we get a more LRU-ish behavior |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 156 | fFreePool.insert(key, surface.release()); |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 157 | } |
| 158 | |
| 159 | // First try to reuse one of the recently allocated/used GrSurfaces in the free pool. |
| 160 | // If we can't find a useable one, create a new one. |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 161 | sk_sp<GrSurface> GrResourceAllocator::findSurfaceFor(const GrSurfaceProxy* proxy, |
| 162 | bool needsStencil) { |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 163 | // First look in the free pool |
| 164 | GrScratchKey key; |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 165 | |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 166 | proxy->priv().computeScratchKey(&key); |
| 167 | |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 168 | auto filter = [&] (const GrSurface* s) { |
| 169 | return !proxy->priv().requiresNoPendingIO() || !s->surfacePriv().hasPendingIO(); |
| 170 | }; |
| 171 | sk_sp<GrSurface> surface(fFreePool.findAndRemove(key, filter)); |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 172 | if (surface) { |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 173 | if (SkBudgeted::kYes == proxy->isBudgeted() && |
| 174 | SkBudgeted::kNo == surface->resourcePriv().isBudgeted()) { |
| 175 | // This gets the job done but isn't quite correct. It would be better to try to |
| 176 | // match budgeted proxies w/ budgeted surface and unbudgeted w/ unbudgeted. |
| 177 | surface->resourcePriv().makeBudgeted(); |
| 178 | } |
| 179 | |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 180 | GrSurfaceProxyPriv::AttachStencilIfNeeded(fResourceProvider, surface.get(), needsStencil); |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 181 | return surface; |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 182 | } |
| 183 | |
| 184 | // Failing that, try to grab a new one from the resource cache |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 185 | return proxy->priv().createSurface(fResourceProvider); |
| 186 | } |
| 187 | |
| 188 | // Remove any intervals that end before the current index. Return their GrSurfaces |
| 189 | // to the free pool. |
| 190 | void GrResourceAllocator::expire(unsigned int curIndex) { |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 191 | while (!fActiveIntvls.empty() && fActiveIntvls.peekHead()->end() < curIndex) { |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 192 | Interval* temp = fActiveIntvls.popHead(); |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 193 | |
| 194 | if (temp->wasAssignedSurface()) { |
| 195 | this->freeUpSurface(temp->detachSurface()); |
| 196 | } |
Robert Phillips | 8186cbe | 2017-11-01 17:32:39 -0400 | [diff] [blame] | 197 | |
| 198 | // Add temp to the free interval list so it can be reused |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 199 | temp->setNext(fFreeIntervalList); |
Robert Phillips | 8186cbe | 2017-11-01 17:32:39 -0400 | [diff] [blame] | 200 | fFreeIntervalList = temp; |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 201 | } |
| 202 | } |
| 203 | |
Greg Daniel | 4684f82 | 2018-03-08 15:27:36 -0500 | [diff] [blame] | 204 | bool GrResourceAllocator::assign(int* startIndex, int* stopIndex, |
| 205 | GrUninstantiateProxyTracker* uninstantiateTracker, |
| 206 | AssignError* outError) { |
Greg Daniel | aa3dfbe | 2018-01-29 10:34:25 -0500 | [diff] [blame] | 207 | SkASSERT(outError); |
| 208 | *outError = AssignError::kNoError; |
| 209 | |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 210 | fIntvlHash.reset(); // we don't need the interval hash anymore |
| 211 | if (fIntvlList.empty()) { |
| 212 | return false; // nothing to render |
| 213 | } |
| 214 | |
| 215 | *startIndex = fCurOpListIndex; |
| 216 | *stopIndex = fEndOfOpListOpIndices.count(); |
| 217 | |
Robert Phillips | 4150eea | 2018-02-07 17:08:21 -0500 | [diff] [blame] | 218 | if (!fResourceProvider->explicitlyAllocateGPUResources()) { |
| 219 | fIntvlList.detachAll(); // arena allocator will clean these up for us |
| 220 | return true; |
| 221 | } |
| 222 | |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 223 | SkDEBUGCODE(fAssigned = true;) |
| 224 | |
| 225 | while (Interval* cur = fIntvlList.popHead()) { |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 226 | if (fEndOfOpListOpIndices[fCurOpListIndex] < cur->start()) { |
| 227 | fCurOpListIndex++; |
| 228 | } |
| 229 | |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 230 | this->expire(cur->start()); |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 231 | |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 232 | bool needsStencil = cur->proxy()->asRenderTargetProxy() |
| 233 | ? cur->proxy()->asRenderTargetProxy()->needsStencil() |
| 234 | : false; |
| 235 | |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 236 | if (cur->proxy()->priv().isInstantiated()) { |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 237 | GrSurfaceProxyPriv::AttachStencilIfNeeded(fResourceProvider, |
| 238 | cur->proxy()->priv().peekSurface(), |
| 239 | needsStencil); |
| 240 | |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 241 | fActiveIntvls.insertByIncreasingEnd(cur); |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 242 | |
| 243 | if (fResourceProvider->overBudget()) { |
| 244 | // Only force intermediate draws on opList boundaries |
| 245 | if (!fIntvlList.empty() && |
| 246 | fEndOfOpListOpIndices[fCurOpListIndex] < fIntvlList.peekHead()->start()) { |
| 247 | *stopIndex = fCurOpListIndex+1; |
| 248 | return true; |
| 249 | } |
| 250 | } |
| 251 | |
Robert Phillips | 57aa367 | 2017-07-21 11:38:13 -0400 | [diff] [blame] | 252 | continue; |
| 253 | } |
| 254 | |
Greg Daniel | 65fa8ca | 2018-01-10 17:06:31 -0500 | [diff] [blame] | 255 | if (GrSurfaceProxy::LazyState::kNot != cur->proxy()->lazyInstantiationState()) { |
Greg Daniel | aa3dfbe | 2018-01-29 10:34:25 -0500 | [diff] [blame] | 256 | if (!cur->proxy()->priv().doLazyInstantiation(fResourceProvider)) { |
| 257 | *outError = AssignError::kFailedProxyInstantiation; |
Greg Daniel | 4684f82 | 2018-03-08 15:27:36 -0500 | [diff] [blame] | 258 | } else { |
| 259 | if (GrSurfaceProxy::LazyInstantiationType::kUninstantiate == |
| 260 | cur->proxy()->priv().lazyInstantiationType()) { |
| 261 | uninstantiateTracker->addProxy(cur->proxy()); |
| 262 | } |
Greg Daniel | aa3dfbe | 2018-01-29 10:34:25 -0500 | [diff] [blame] | 263 | } |
Chris Dalton | 706a6ff | 2017-11-29 22:01:06 -0700 | [diff] [blame] | 264 | } else if (sk_sp<GrSurface> surface = this->findSurfaceFor(cur->proxy(), needsStencil)) { |
Robert Phillips | f8e2502 | 2017-11-08 15:24:31 -0500 | [diff] [blame] | 265 | // TODO: make getUniqueKey virtual on GrSurfaceProxy |
| 266 | GrTextureProxy* tex = cur->proxy()->asTextureProxy(); |
| 267 | if (tex && tex->getUniqueKey().isValid()) { |
| 268 | fResourceProvider->assignUniqueKeyToResource(tex->getUniqueKey(), surface.get()); |
| 269 | SkASSERT(surface->getUniqueKey() == tex->getUniqueKey()); |
| 270 | } |
| 271 | |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 272 | cur->assign(std::move(surface)); |
Greg Daniel | aa3dfbe | 2018-01-29 10:34:25 -0500 | [diff] [blame] | 273 | } else { |
| 274 | SkASSERT(!cur->proxy()->priv().isInstantiated()); |
| 275 | *outError = AssignError::kFailedProxyInstantiation; |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 276 | } |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 277 | |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 278 | fActiveIntvls.insertByIncreasingEnd(cur); |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 279 | |
| 280 | if (fResourceProvider->overBudget()) { |
| 281 | // Only force intermediate draws on opList boundaries |
| 282 | if (!fIntvlList.empty() && |
| 283 | fEndOfOpListOpIndices[fCurOpListIndex] < fIntvlList.peekHead()->start()) { |
| 284 | *stopIndex = fCurOpListIndex+1; |
| 285 | return true; |
| 286 | } |
| 287 | } |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 288 | } |
Robert Phillips | 5b65a84 | 2017-11-13 15:48:12 -0500 | [diff] [blame] | 289 | |
| 290 | // expire all the remaining intervals to drain the active interval list |
| 291 | this->expire(std::numeric_limits<unsigned int>::max()); |
Robert Phillips | eafd48a | 2017-11-16 07:52:08 -0500 | [diff] [blame] | 292 | return true; |
Robert Phillips | 5af44de | 2017-07-18 14:49:38 -0400 | [diff] [blame] | 293 | } |