commit cbbd5653da08f4caebd0a6255a90b3ee28f580e1
author Jim Van Verth <jvanverth@google.com> Wed Apr 07 14:27:55 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 07 19:27:00 2021 +0000
tree 1d0e43f298c13e7bec70307048b563069d6f8b90
parent 8cad6374f05e281e1fde0e104afb7b7042fbe181

Fix mipScale issue in GrSmallPathRenderer

Bug: skia:11840
Change-Id: Ief89855554e4ed21da20a2fdef4945294cf46498
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/393416
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/gpu/ops/GrSmallPathRenderer.cpp

diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 642a9c7..982fe24 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -292,7 +292,9 @@
                     SkScalar log = SkScalarCeilToScalar(SkScalarLog2(maxScale));
                     mipScale = SkScalarPow(2, log);
                 }
-                SkASSERT(maxScale <= mipScale);
+                // Log2 isn't very precise at values close to a power of 2,
+                // so add a little tolerance here. A little bit of scaling up is fine.
+                SkASSERT(maxScale <= mipScale + SK_ScalarNearlyZero);
 
                 SkScalar mipSize = mipScale*SkScalarAbs(maxDim);
                 // For sizes less than kIdealMinMIP we want to use as large a distance field as we can