Move some of the adding stencil attachment logic of Gpu and into Render Target.

src/gpu/GrGpu.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpu.h"
@@ skipping 116 matching lines @@
     }
     if (tex) {
         fStats.incTextureCreates();
         if (srcData) {
             fStats.incTextureUploads();
         }
     }
     return tex;
 }
 
-bool GrGpu::attachStencilAttachmentToRenderTarget(GrRenderTarget* rt) {
+bool GrGpu::getStencilAttachment(const GrRenderTarget* rt, GrStencilAttachment** stencil) {
     SkASSERT(nullptr == rt->renderTargetPriv().getStencilAttachment());
+    SkASSERT(nullptr == *stencil);
     GrUniqueKey sbKey;
 
     int width = rt->width();
     int height = rt->height();
 #if 0
     if (this->caps()->oversizedStencilSupport()) {
         width  = SkNextPow2(width);
         height = SkNextPow2(height);
     }
 #endif
 
     GrStencilAttachment::ComputeSharedStencilAttachmentKey(width, height,
         rt->numStencilSamples(), &sbKey);
-    SkAutoTUnref<GrStencilAttachment> sb(static_cast<GrStencilAttachment*>(
-        this->getContext()->getResourceCache()->findAndRefUniqueResource(sbKey)));
-    if (sb) {
-        if (this->attachStencilAttachmentToRenderTarget(sb, rt)) {
-            rt->renderTargetPriv().didAttachStencilAttachment(sb);
-            return true;
-        }
+    *stencil = static_cast<GrStencilAttachment*>(
+        this->getContext()->getResourceCache()->findAndRefUniqueResource(sbKey));
+    if (*stencil) {
         return false;
     }
-    if (this->createStencilAttachmentForRenderTarget(rt, width, height)) {
-        // Right now we're clearing the stencil buffer here after it is
-        // attached to an RT for the first time. When we start matching
-        // stencil buffers with smaller color targets this will no longer
-        // be correct because it won't be guaranteed to clear the entire
-        // sb.
-        // We used to clear down in the GL subclass using a special purpose
-        // FBO. But iOS doesn't allow a stencil-only FBO. It reports unsupported
-        // FBO status.
-        this->clearStencil(rt);
-        GrStencilAttachment* sb = rt->renderTargetPriv().getStencilAttachment();
-        sb->resourcePriv().setUniqueKey(sbKey);
+    *stencil = this->createStencilAttachmentForRenderTarget(rt, width, height);
+    if (*stencil) {
+        (*stencil)->resourcePriv().setUniqueKey(sbKey);
         return true;
-    } else {
-        return false;
     }
+    return false;
 }
 
 GrTexture* GrGpu::wrapBackendTexture(const GrBackendTextureDesc& desc, GrWrapOwnership ownership) {
     this->handleDirtyContext();
     GrTexture* tex = this->onWrapBackendTexture(desc, ownership);
     if (nullptr == tex) {
         return nullptr;
     }
     // TODO: defer this and attach dynamically
     GrRenderTarget* tgt = tex->asRenderTarget();
-    if (tgt && !this->attachStencilAttachmentToRenderTarget(tgt)) {
+    if (tgt && !tgt->renderTargetPriv().attachStencilAttachment()) {
         tex->unref();
         return nullptr;
     } else {
         return tex;
     }
 }
 
 GrRenderTarget* GrGpu::wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc,
                                                GrWrapOwnership ownership) {
     this->handleDirtyContext();
@@ skipping 164 matching lines @@
         this->xferBarrier(args.fPipeline->getRenderTarget(), barrierType);
     }
 
     GrVertices::Iterator iter;
     const GrNonInstancedVertices* verts = iter.init(vertices);
     do {
         this->onDraw(args, *verts);
         fStats.incNumDraws();
     } while ((verts = iter.next()));
 }