Fix gpu memory accounting for auto-resolving MSAA.

src/gpu/gl/GrGLRenderTarget.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLRenderTarget.h"
 
 #include "GrGLGpu.h"
@@ skipping 21 matching lines @@
     fTexFBOID               = idDesc.fTexFBOID;
     fMSColorRenderbufferID  = idDesc.fMSColorRenderbufferID;
     fIsWrapped              = kWrapped_LifeCycle == idDesc.fLifeCycle;
 
     fViewport.fLeft   = 0;
     fViewport.fBottom = 0;
     fViewport.fWidth  = desc.fWidth;
     fViewport.fHeight = desc.fHeight;
 
     // We own one color value for each MSAA sample.
-    fColorValuesPerPixel = SkTMax(1, fDesc.fSampleCnt);
+    int colorValuesPerPixel = SkTMax(1, fDesc.fSampleCnt);
     if (fTexFBOID != fRTFBOID) {
         // If we own the resolve buffer then that is one more sample per pixel.
-        fColorValuesPerPixel += 1;
-    } 
-}
-
-size_t GrGLRenderTarget::onGpuMemorySize() const {
+        colorValuesPerPixel += 1;
+    } else if (fTexFBOID != 0) {
+        // For auto-resolving FBOs, the MSAA buffer is free.
+        colorValuesPerPixel = 1;
+    }
     SkASSERT(kUnknown_GrPixelConfig != fDesc.fConfig);
     SkASSERT(!GrPixelConfigIsCompressed(fDesc.fConfig));
     size_t colorBytes = GrBytesPerPixel(fDesc.fConfig);
     SkASSERT(colorBytes > 0);
-    return fColorValuesPerPixel * fDesc.fWidth * fDesc.fHeight * colorBytes;
+    fGpuMemorySize = colorValuesPerPixel * fDesc.fWidth * fDesc.fHeight * colorBytes;
+}
+
+size_t GrGLRenderTarget::onGpuMemorySize() const {
+    return fGpuMemorySize;
 }
 
 void GrGLRenderTarget::onRelease() {
     if (!fIsWrapped) {
         if (fTexFBOID) {
             GL_CALL(DeleteFramebuffers(1, &fTexFBOID));
         }
         if (fRTFBOID && fRTFBOID != fTexFBOID) {
             GL_CALL(DeleteFramebuffers(1, &fRTFBOID));
         }
         if (fMSColorRenderbufferID) {
             GL_CALL(DeleteRenderbuffers(1, &fMSColorRenderbufferID));
         }
     }
     fRTFBOID                = 0;
     fTexFBOID               = 0;
     fMSColorRenderbufferID  = 0;
     fIsWrapped              = false;
     INHERITED::onRelease();
 }
 
 void GrGLRenderTarget::onAbandon() {
     fRTFBOID                = 0;
     fTexFBOID               = 0;
     fMSColorRenderbufferID  = 0;
     fIsWrapped              = false;
     INHERITED::onAbandon();
 }