commit 5dd64f37d1cf7b91e0d394134d906190a40f9ba8
author Brian Salomon <bsalomon@google.com> Mon Feb 10 14:23:10 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 10 19:48:24 2020 +0000
tree a9d0be759c9b84fa9ab7665f320ca9fd9a5675d9
parent 4e9985327ba37b8105c2e5ce6b942a76e242cdb1

Fix fiddle after change to remove GrSurfaceDesc.

Broken by:
https://skia-review.googlesource.com/c/skia/+/269374

Bug: skia:9891
Change-Id: I9ebe6d0303fc1f868c0c0498c3492047bbd63c7d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269901
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>

tools/fiddle/fiddle_main.cpp

diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp
index cfd27f9..df369fc 100644
--- a/tools/fiddle/fiddle_main.cpp
+++ b/tools/fiddle/fiddle_main.cpp
@@ -182,17 +182,18 @@
         }
     }
 
-    SkAutoTMalloc<uint32_t> data(bm.dimensions().area());
-    sk_memset32(data.get(), 0, bm.dimensions().area());
+    SkISize offscreenDims = {options.fOffScreenWidth, options.fOffScreenHeight};
+    SkAutoTMalloc<uint32_t> data(offscreenDims.area());
+    sk_memset32(data.get(), 0, offscreenDims.area());
 
     {
         // This backend object should be renderable but not textureable. Given the limitations
         // of how we're creating it though it will wind up being secretly textureable.
         // We use this fact to initialize it with data but don't allow mipmaps
-        GrMipLevel level0 = { data.get(), bm.width()*sizeof(uint32_t) };
+        GrMipLevel level0 = { data.get(), offscreenDims.width()*sizeof(uint32_t) };
 
         sk_sp<GrTexture> tmp = resourceProvider->createTexture(
-                bm.dimensions(), renderableFormat, GrColorType::kRGBA_8888, GrRenderable::kYes,
+                offscreenDims, renderableFormat, GrColorType::kRGBA_8888, GrRenderable::kYes,
                 options.fOffScreenSampleCount, SkBudgeted::kNo, GrProtected::kNo, &level0, 1);
         if (!tmp || !tmp->asRenderTarget()) {
             fputs("GrTexture is invalid.\n", stderr);
@@ -209,13 +210,14 @@
     }
 
     {
-        int mipLevelCount = GrMipMapped::kYes == options.fOffScreenMipMapping
-                                    ? SkMipMap::ComputeLevelCount(bm.width(), bm.height())
-                                    : 1;
+        int mipLevelCount =
+                GrMipMapped::kYes == options.fOffScreenMipMapping
+                        ? SkMipMap::ComputeLevelCount(offscreenDims.width(), offscreenDims.height())
+                        : 1;
         std::unique_ptr<GrMipLevel[]> texels(new GrMipLevel[mipLevelCount]);
 
         texels[0].fPixels = data.get();
-        texels[0].fRowBytes = bm.width()*sizeof(uint32_t);
+        texels[0].fRowBytes = offscreenDims.width()*sizeof(uint32_t);
 
         for (int i = 1; i < mipLevelCount; i++) {
             texels[i].fPixels = nullptr;
@@ -223,7 +225,7 @@
         }
 
         backingTextureRenderTarget = resourceProvider->createTexture(
-                bm.dimensions(), renderableFormat, GrColorType::kRGBA_8888, GrRenderable::kYes,
+                offscreenDims, renderableFormat, GrColorType::kRGBA_8888, GrRenderable::kYes,
                 options.fOffScreenSampleCount, SkBudgeted::kNo, GrProtected::kNo, texels.get(),
                 mipLevelCount);
         if (!backingTextureRenderTarget || !backingTextureRenderTarget->asRenderTarget()) {