aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrResourceAllocator.h
diff options
context:
space:
mode:
authorGravatar Chris Dalton <csmartdalton@google.com>2017-11-29 20:53:58 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-29 20:54:06 +0000
commitc3fd600c408f9cad8d9b09226e028ec6b22734c8 (patch)
treeada89456620dad92a5ebbf18600afdf944edb032 /src/gpu/GrResourceAllocator.h
parent7072e226ab03ca2a2a7981294639fa8b878a1970 (diff)
Revert "Make sure to visit clips and dst proxies during gather"
This reverts commit c666502bc6975a73ef352d673b151017a21e8562. Reason for revert: <INSERT REASONING HERE> Original change's description: > Make sure to visit clips and dst proxies during gather > > Bug: skia:7190 > Change-Id: I6ba5bad6e155e9092dff9c2ad3241f603c333b4d > Reviewed-on: https://skia-review.googlesource.com/76460 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Chris Dalton <csmartdalton@google.com> TBR=robertphillips@google.com,csmartdalton@google.com Change-Id: I4839594bb97472f5ac2057600a0889c8a9dff5f9 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7190 Reviewed-on: https://skia-review.googlesource.com/77781 Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/GrResourceAllocator.h')
-rw-r--r--src/gpu/GrResourceAllocator.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/GrResourceAllocator.h b/src/gpu/GrResourceAllocator.h
index dde7519392..f576649030 100644
--- a/src/gpu/GrResourceAllocator.h
+++ b/src/gpu/GrResourceAllocator.h
@@ -120,9 +120,8 @@ private:
void setNext(Interval* next) { fNext = next; }
void extendEnd(unsigned int newEnd) {
- if (newEnd > fEnd) {
- fEnd = newEnd;
- }
+ SkASSERT(newEnd >= fEnd);
+ fEnd = newEnd;
}
void assign(sk_sp<GrSurface>);