commit 99b1a8b2f8a01dea92b58709352a45f49fc87056
author Jim Van Verth <jvanverth@google.com> Thu Oct 08 22:51:32 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 08 23:52:34 2020 +0000
tree 91485aecbc2bd35baf12aae5d3fc32a87295ad8e
parent 6bbf026b5432006edb0aedf5c107660e067b43a8

Revert "Rename GrStencilAttachment class to generic GrAttachment"

This reverts commit 6113d50ec48be049c13a6e4bbea191df93e68674.

Reason for revert: Breaking MSAN bot

Original change's description:
> Rename GrStencilAttachment class to generic GrAttachment
>
> Additional this adds a UsageFlags member to the new GrAttachment
> class.
>
> Bug: skia:10727
> Change-Id: Ifc0bfffd959f5fbc46bfcdf269e1b2a933929753
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323107
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com

Change-Id: I2ee2a1fcabd75bc24d3b7c3f76d971a3adb370a3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:10727
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324276
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/gl/GrGLRenderTarget.cpp

diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index 448fdaa..184f1db 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -25,7 +25,7 @@
                                    GrGLFormat format,
                                    int sampleCount,
                                    const IDs& ids,
-                                   GrGLAttachment* stencil)
+                                   GrGLStencilAttachment* stencil)
         : GrSurface(gpu, dimensions, GrProtected::kNo)
         , INHERITED(gpu, dimensions, sampleCount, GrProtected::kNo, stencil) {
     this->setFlags(gpu->glCaps(), ids);
@@ -81,9 +81,9 @@
                                                       int sampleCount,
                                                       const IDs& idDesc,
                                                       int stencilBits) {
-    GrGLAttachment* sb = nullptr;
+    GrGLStencilAttachment* sb = nullptr;
     if (stencilBits) {
-        GrGLAttachment::IDDesc sbDesc;
+        GrGLStencilAttachment::IDDesc sbDesc;
         // We pick a "fake" actual format that matches the number of stencil bits. When wrapping
         // an FBO with some number of stencil bits all we care about in the future is that we have
         // a format with the same number of stencil bits. We don't even directly use the format or
@@ -92,8 +92,7 @@
         GrGLFormat sFmt = stencil_bits_to_format(stencilBits);
 
         // Ownership of sb is passed to the GrRenderTarget so doesn't need to be deleted
-        sb = new GrGLAttachment(gpu, sbDesc, dimensions, GrAttachment::UsageFlags::kStencil,
-                                sampleCount, sFmt);
+        sb = new GrGLStencilAttachment(gpu, sbDesc, dimensions, sampleCount, sFmt);
     }
     return sk_sp<GrGLRenderTarget>(
             new GrGLRenderTarget(gpu, dimensions, format, sampleCount, idDesc, sb));
@@ -104,7 +103,7 @@
     fbi.fFBOID = fRTFBOID;
     fbi.fFormat = GrGLFormatToEnum(this->format());
     int numStencilBits = 0;
-    if (GrAttachment* stencil = this->getStencilAttachment()) {
+    if (GrStencilAttachment* stencil = this->getStencilAttachment()) {
         numStencilBits = GrBackendFormatStencilBits(stencil->backendFormat());
     }
 
@@ -126,7 +125,7 @@
 bool GrGLRenderTarget::completeStencilAttachment() {
     GrGLGpu* gpu = this->getGLGpu();
     const GrGLInterface* interface = gpu->glInterface();
-    GrAttachment* stencil = this->getStencilAttachment();
+    GrStencilAttachment* stencil = this->getStencilAttachment();
     if (nullptr == stencil) {
         GR_GL_CALL(interface, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
                                                       GR_GL_STENCIL_ATTACHMENT,
@@ -145,7 +144,7 @@
 #endif
         return true;
     } else {
-        const GrGLAttachment* glStencil = static_cast<const GrGLAttachment*>(stencil);
+        const GrGLStencilAttachment* glStencil = static_cast<const GrGLStencilAttachment*>(stencil);
         GrGLuint rb = glStencil->renderbufferID();
 
         gpu->invalidateBoundRenderTarget();