commit ccd3c8937fce4bb28df19533ed043cad209e277d
author Robert Phillips <robertphillips@google.com> Fri Nov 04 10:23:43 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 04 15:35:51 2016 +0000
tree 2db35e0f6715ee21118d39633c0db10a8c8fb3f6
parent 544da7a7c399ab9775d6dbb441a5a695569f9939

Further centralize computation of GrSurface VRAM consumption

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4383

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

src/gpu/gl/GrGLRenderTarget.cpp

diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index 2f92e0a..5af5e67 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -82,7 +82,7 @@
 }
 
 size_t GrGLRenderTarget::onGpuMemorySize() const {
-    return GrRenderTarget::ComputeSize(fDesc, fNumSamplesOwnedPerPixel);
+    return GrSurface::ComputeSize(fDesc, fNumSamplesOwnedPerPixel, false);
 }
 
 bool GrGLRenderTarget::completeStencilAttachment() {
@@ -183,7 +183,7 @@
     // Log any renderbuffer's contribution to memory. We only do this if we own the renderbuffer
     // (have a fMSColorRenderbufferID).
     if (fMSColorRenderbufferID) {
-        size_t size = GrRenderTarget::ComputeSize(fDesc, this->msaaSamples());
+        size_t size = GrSurface::ComputeSize(fDesc, this->msaaSamples(), false);
 
         // Due to this resource having both a texture and a renderbuffer component, dump as
         // skia/gpu_resources/resource_#/renderbuffer