From 5efd5ea4e146c47394d16c8b6f876264822a0bee Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 30 May 2017 13:47:32 -0400 Subject: 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 Commit-Queue: Robert Phillips --- include/gpu/GrGpuResourceRef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') 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: -- cgit v1.2.3