Rename GrStencilBuffer to GrStencilAttachment

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"
 
 #include "GrBufferAllocPool.h"
 #include "GrContext.h"
 #include "GrDrawTargetCaps.h"
 #include "GrGpuResourcePriv.h"
 #include "GrIndexBuffer.h"
 #include "GrResourceCache.h"
 #include "GrRenderTargetPriv.h"
-#include "GrStencilBuffer.h"
+#include "GrStencilAttachment.h"
 #include "GrVertexBuffer.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 GrGpu::GrGpu(GrContext* context)
     : fResetTimestamp(kExpiredTimestamp+1)
     , fResetBits(kAll_GrBackendState)
     , fQuadIndexBuffer(NULL)
     , fGpuTraceMarkerCount(0)
     , fContext(context) {
@@ skipping 39 matching lines @@
     }
     if (tex) {
         fStats.incTextureCreates();
         if (srcData) {
             fStats.incTextureUploads();
         }
     }
     return tex;
 }
 
-bool GrGpu::attachStencilBufferToRenderTarget(GrRenderTarget* rt) {
-    SkASSERT(NULL == rt->renderTargetPriv().getStencilBuffer());
+bool GrGpu::attachStencilAttachmentToRenderTarget(GrRenderTarget* rt) {
+    SkASSERT(NULL == rt->renderTargetPriv().getStencilAttachment());
     GrUniqueKey sbKey;
 
     int width = rt->width();
     int height = rt->height();
 #if 0
     if (this->caps()->oversizedStencilSupport()) {
         width  = SkNextPow2(width);
         height = SkNextPow2(height);
     }
 #endif
 
-    GrStencilBuffer::ComputeSharedStencilBufferKey(width, height, rt->numSamples(), &sbKey);
-    SkAutoTUnref<GrStencilBuffer> sb(static_cast<GrStencilBuffer*>(
+    GrStencilAttachment::ComputeSharedStencilAttachmentKey(width, height, rt->numSamples(), &sbKey);
+    SkAutoTUnref<GrStencilAttachment> sb(static_cast<GrStencilAttachment*>(
         this->getContext()->getResourceCache()->findAndRefUniqueResource(sbKey)));
     if (sb) {
-        if (this->attachStencilBufferToRenderTarget(sb, rt)) {
-            rt->renderTargetPriv().didAttachStencilBuffer(sb);
+        if (this->attachStencilAttachmentToRenderTarget(sb, rt)) {
+            rt->renderTargetPriv().didAttachStencilAttachment(sb);
             return true;
         }
         return false;
     }
-    if (this->createStencilBufferForRenderTarget(rt, width, height)) {
+    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);
-        GrStencilBuffer* sb = rt->renderTargetPriv().getStencilBuffer();
+        GrStencilAttachment* sb = rt->renderTargetPriv().getStencilAttachment();
         sb->resourcePriv().setUniqueKey(sbKey);
         return true;
     } else {
         return false;
     }
 }
 
 GrTexture* GrGpu::wrapBackendTexture(const GrBackendTextureDesc& desc) {
     this->handleDirtyContext();
     GrTexture* tex = this->onWrapBackendTexture(desc);
     if (NULL == tex) {
         return NULL;
     }
     // TODO: defer this and attach dynamically
     GrRenderTarget* tgt = tex->asRenderTarget();
-    if (tgt && !this->attachStencilBufferToRenderTarget(tgt)) {
+    if (tgt && !this->attachStencilAttachmentToRenderTarget(tgt)) {
         tex->unref();
         return NULL;
     } else {
         return tex;
     }
 }
 
 GrRenderTarget* GrGpu::wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc) {
     this->handleDirtyContext();
     return this->onWrapBackendRenderTarget(desc);
@@ skipping 176 matching lines @@
                       GrDrawTarget::PathIndexType indexType,
                       const float transformValues[],
                       GrDrawTarget::PathTransformType transformType,
                       int count,
                       const GrStencilSettings& stencilSettings) {
     this->handleDirtyContext();
     pathRange->willDrawPaths(indices, indexType, count);
     this->onDrawPaths(args, pathRange, indices, indexType, transformValues,
                       transformType, count, stencilSettings);
 }