commit c0192e346ccdcacedb4d4f1f53a85caa29b97a6f
author Robert Phillips <robertphillips@google.com> Thu Sep 21 12:00:26 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 21 16:42:41 2017 +0000
tree 34f79cc8cec58e1413c1e0c585f7222ffec0e0ad
parent 5fdbb8a8a76ec5c900bd373239bf4d42e33fb5a5

Remove pre-attachment of stencil buffers

Change-Id: I4ef555a2b36cf3a0ec74e0ecf7e8ab4f8779df3e
Reviewed-on: https://skia-review.googlesource.com/49740
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrResourceProvider.cpp

diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index 0182baa..7f098e4 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -420,10 +420,10 @@
     return buffer;
 }
 
-GrStencilAttachment* GrResourceProvider::attachStencilAttachment(GrRenderTarget* rt) {
+bool GrResourceProvider::attachStencilAttachment(GrRenderTarget* rt) {
     SkASSERT(rt);
     if (rt->renderTargetPriv().getStencilAttachment()) {
-        return rt->renderTargetPriv().getStencilAttachment();
+        return true;
     }
 
     if (!rt->wasDestroyed() && rt->canAttemptStencilAttachment()) {
@@ -462,7 +462,7 @@
 #endif
         }
     }
-    return rt->renderTargetPriv().getStencilAttachment();
+    return SkToBool(rt->renderTargetPriv().getStencilAttachment());
 }
 
 sk_sp<GrRenderTarget> GrResourceProvider::wrapBackendTextureAsRenderTarget(