commit 27b4d8d8db04566f96edebd167c82da1aaf64868
author Brian Salomon <bsalomon@google.com> Mon Jul 22 14:23:45 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 23 13:42:29 2019 +0000
tree ef81420e7294873c141c7d2e1ef6cf9b0961aa81
parent 5207f35f33b1ccc173cff02bd0a38223554ba6f2

Remove sample count from GrSurfaceDesc.

This leaves just width, height, and GrPixelConfig. Once we remove the
latter we can replace GrSurfaceDesc with SkISize.

Also remove unused GrRenderTarget::overrideResolveRect

Also remove GrSurfaceProxy::Renderable and use GrRenderable instead.

Change-Id: I652fe6169a22ca33d199b144ec6385286ac07b5a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/228570
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrSurface.cpp

diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index 67804bf..cd0afcb 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -16,7 +16,8 @@
 #include "src/core/SkMathPriv.h"
 #include "src/gpu/SkGr.h"
 
-size_t GrSurface::WorstCaseSize(const GrSurfaceDesc& desc, GrRenderable renderable, bool binSize) {
+size_t GrSurface::WorstCaseSize(const GrSurfaceDesc& desc, GrRenderable renderable,
+                                int renderTargetSampleCnt, bool binSize) {
     size_t size;
 
     int width  = binSize ? GrResourceProvider::MakeApprox(desc.fWidth)  : desc.fWidth;
@@ -24,9 +25,9 @@
 
     if (renderable == GrRenderable::kYes) {
         // We own one color value for each MSAA sample.
-        SkASSERT(desc.fSampleCnt >= 1);
-        int colorValuesPerPixel = desc.fSampleCnt;
-        if (desc.fSampleCnt > 1) {
+        SkASSERT(renderTargetSampleCnt >= 1);
+        int colorValuesPerPixel = renderTargetSampleCnt;
+        if (renderTargetSampleCnt > 1) {
             // Worse case, we own the resolve buffer so that is one more sample per pixel.
             colorValuesPerPixel += 1;
         }
@@ -41,6 +42,7 @@
         size = colorValuesPerPixel * colorBytes;
         size += colorBytes/3; // in case we have to mipmap
     } else {
+        SkASSERT(renderTargetSampleCnt == 1);
         if (GrPixelConfigIsCompressed(desc.fConfig)) {
             size = GrCompressedFormatDataSize(desc.fConfig, width, height);
         } else {