diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-30 13:47:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-31 17:00:22 +0000 |
| commit | 5efd5ea4e146c47394d16c8b6f876264822a0bee (patch) | |
| tree | 81bff3047ae76431524c75bd9d351171b5fe50e5 /include | |
| parent | bef2852a8ca0c2dccd9500857a03208d39e3d4f7 (diff) | |
Update clearOp for split-OpList world (take 3)
It would reduce a lot of noise if the GrRenderTargetOpList kept a pointer to the GrCaps but, for now, I'm trying to shrink the GrRTOpList, not expand it.
Reland of: https://skia-review.googlesource.com/c/17323/ (Update clearOp for split-OpList world)
Change-Id: Ia61ce4d6ce245380fc9651928a46c22039fc12cf
Reviewed-on: https://skia-review.googlesource.com/18026
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrGpuResourceRef.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gpu/GrGpuResourceRef.h b/include/gpu/GrGpuResourceRef.h index ca1b55a2ed..3e173929f5 100644 --- a/include/gpu/GrGpuResourceRef.h +++ b/include/gpu/GrGpuResourceRef.h @@ -95,7 +95,7 @@ class GrSurfaceProxyRef : SkNoncopyable { public: virtual ~GrSurfaceProxyRef(); - GrSurfaceProxy* getProxy() const { return fProxy; } + GrSurfaceProxy* get() const { return fProxy; } /** Does this object own a pending read or write on the resource it is wrapping. */ bool ownsPendingIO() const { return fPendingIO; } @@ -226,7 +226,7 @@ public: : GrPendingIOResource(that.get()) { } - void reset(T* resource) { + void reset(T* resource = nullptr) { if (resource) { switch (IO_TYPE) { case kRead_GrIOType: |