commit 010bb4659b7c6e3bf1116b7bf42d2857757f0dbb
author Brian Salomon <bsalomon@google.com> Fri Jan 29 14:42:38 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sun Jan 31 17:43:21 2021 +0000
tree 33835ffcb2b41e4d3820bcae62e2953aa0a206c8
parent bb617682668347072ee36b3d41e2d443c0cbd28c

Revert "Revert "Remove maxTileSize from GrCaps, bleed GMs use max texture size override.""

Use of uninit memory in bench fixed here:
 https://skia-review.googlesource.com/c/skia/+/362478

This reverts commit c621dcf354ea5665c6b18eb74b6c7ea49e70f88d.

Bug: skia:11208
Change-Id: Ia13dde689a982f485a93daf8eeb8b716c9c23796
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362456
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/SkGpuDevice_drawTexture.cpp

diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index 82463f0..863db4e 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -620,9 +620,6 @@
                 // We should have already handled bitmaps larger than the max texture size.
                 SkASSERT(tmpB.width() <= context->priv().caps()->maxTextureSize() &&
                          tmpB.height() <= context->priv().caps()->maxTextureSize());
-                // We should be respecting the max tile size by the time we get here.
-                SkASSERT(tmpB.width() <= context->priv().caps()->maxTileSize() &&
-                         tmpB.height() <= context->priv().caps()->maxTileSize());
 
                 GrBitmapTextureMaker tileProducer(context, tmpB, GrImageTexGenPolicy::kDraw);
 
@@ -772,7 +769,7 @@
         } else {
             tileFilterPad = 1;
         }
-        int maxTileSize = fContext->priv().caps()->maxTileSize() - 2 * tileFilterPad;
+        int maxTileSize = fContext->priv().caps()->maxTextureSize() - 2*tileFilterPad;
         int tileSize;
         SkIRect clippedSubset;
         if (should_tile_image_id(fContext.get(), fSurfaceDrawContext->dimensions(), clip,