commit 7fd7a8aef06c2f97eaa64a87e33e2a2245acb4e7
author Greg Daniel <egdaniel@google.com> Thu Oct 10 16:10:31 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 10 20:39:05 2019 +0000
tree 084f05415fe311de903ce8debd569651f4d5ebfd
parent 66ae304f501e58ef410c4231dc90135d47fc538a

Remove uses of GrPixelConfig version of GrBytesPerPixel.

Bug: skia:6718
Change-Id: I8421f38644567973f0b8de29b745ca9a471583bf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247598
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrTextureRenderTargetProxy.cpp

diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp
index bada555..e73fe15 100644
--- a/src/gpu/GrTextureRenderTargetProxy.cpp
+++ b/src/gpu/GrTextureRenderTargetProxy.cpp
@@ -106,7 +106,7 @@
     }
 }
 
-size_t GrTextureRenderTargetProxy::onUninstantiatedGpuMemorySize() const {
+size_t GrTextureRenderTargetProxy::onUninstantiatedGpuMemorySize(const GrCaps& caps) const {
     int colorSamplesPerPixel = this->numSamples();
     if (colorSamplesPerPixel > 1) {
         // Add one to account for the resolve buffer.
@@ -114,8 +114,8 @@
     }
 
     // TODO: do we have enough information to improve this worst case estimate?
-    return GrSurface::ComputeSize(this->config(), this->width(), this->height(),
-                                  colorSamplesPerPixel, this->proxyMipMapped(),
+    return GrSurface::ComputeSize(this->config(), caps, this->backendFormat(), this->width(),
+                                  this->height(), colorSamplesPerPixel, this->proxyMipMapped(),
                                   !this->priv().isExact());
 }