commit 3786c7716c4796146835e60d7145cff252ed50bd
author Robert Phillips <robertphillips@google.com> Thu Oct 06 17:38:46 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 07 13:09:23 2016 +0000
tree 926f22d27b064f6598f33fe5c512b925bef7078c
parent 1aebdaee0e2aa4324509fd3ad4c40c21703ae4a2

Disable antialiasing on interior of filled RRects that need distance vectors

The interior antialiasing was causing a small transparent rectangle in the middle of filled rects

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3062

Change-Id: If0bf26b96c8969af6d81f3a3d6fee59e8c1d747e
Reviewed-on: https://skia-review.googlesource.com/3062
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrOvalRenderer.cpp

diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 3f759e9..c809a47 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -1548,7 +1548,7 @@
 
     static void FillInOverstrokeVerts(CircleVertex** verts, const SkRect& bounds,
                                       SkScalar smInset, SkScalar bigInset, SkScalar xOffset,
-                                      SkScalar outerRadius, GrColor color) {
+                                      SkScalar outerRadius, SkScalar innerRadius, GrColor color) {
         SkASSERT(smInset < bigInset);
 
         // TL
@@ -1556,7 +1556,7 @@
         (*verts)->fColor = color;
         (*verts)->fOffset = SkPoint::Make(xOffset, 0);
         (*verts)->fOuterRadius = outerRadius;
-        (*verts)->fInnerRadius = 0;
+        (*verts)->fInnerRadius = innerRadius;
         (*verts)++;
 
         // TR
@@ -1564,35 +1564,35 @@
         (*verts)->fColor = color;
         (*verts)->fOffset = SkPoint::Make(xOffset, 0);
         (*verts)->fOuterRadius = outerRadius;
-        (*verts)->fInnerRadius = 0;
+        (*verts)->fInnerRadius = innerRadius;
         (*verts)++;
 
         (*verts)->fPos = SkPoint::Make(bounds.fLeft + bigInset,  bounds.fTop + bigInset);
         (*verts)->fColor = color;
         (*verts)->fOffset = SkPoint::Make(0, 0);
         (*verts)->fOuterRadius = outerRadius;
-        (*verts)->fInnerRadius = 0;
+        (*verts)->fInnerRadius = innerRadius;
         (*verts)++;
 
         (*verts)->fPos = SkPoint::Make(bounds.fRight - bigInset,  bounds.fTop + bigInset);
         (*verts)->fColor = color;
         (*verts)->fOffset = SkPoint::Make(0, 0);
         (*verts)->fOuterRadius = outerRadius;
-        (*verts)->fInnerRadius = 0;
+        (*verts)->fInnerRadius = innerRadius;
         (*verts)++;
 
         (*verts)->fPos = SkPoint::Make(bounds.fLeft + bigInset, bounds.fBottom - bigInset);
         (*verts)->fColor = color;
         (*verts)->fOffset = SkPoint::Make(0, 0);
         (*verts)->fOuterRadius = outerRadius;
-        (*verts)->fInnerRadius = 0;
+        (*verts)->fInnerRadius = innerRadius;
         (*verts)++;
 
         (*verts)->fPos = SkPoint::Make(bounds.fRight - bigInset, bounds.fBottom - bigInset);
         (*verts)->fColor = color;
         (*verts)->fOffset = SkPoint::Make(0, 0);
         (*verts)->fOuterRadius = outerRadius;
-        (*verts)->fInnerRadius = 0;
+        (*verts)->fInnerRadius = innerRadius;
         (*verts)++;
 
         // BL
@@ -1600,7 +1600,7 @@
         (*verts)->fColor = color;
         (*verts)->fOffset = SkPoint::Make(xOffset, 0);
         (*verts)->fOuterRadius = outerRadius;
-        (*verts)->fInnerRadius = 0;
+        (*verts)->fInnerRadius = innerRadius;
         (*verts)++;
 
         // BR
@@ -1608,7 +1608,7 @@
         (*verts)->fColor = color;
         (*verts)->fOffset = SkPoint::Make(xOffset, 0);
         (*verts)->fOuterRadius = outerRadius;
-        (*verts)->fInnerRadius = 0;
+        (*verts)->fInnerRadius = innerRadius;
         (*verts)++;
     }
 
@@ -1715,7 +1715,7 @@
                 SkScalar maxOffset = -args.fInnerRadius / overstrokeOuterRadius;
 
                 FillInOverstrokeVerts(&verts, bounds, outerRadius, overstrokeOuterRadius,
-                                      maxOffset, overstrokeOuterRadius, color);
+                                      maxOffset, overstrokeOuterRadius, 0.0f, color);
             }
 
             if (kFillWithDist_RRectType == args.fType) {
@@ -1724,7 +1724,7 @@
                 SkScalar xOffset = 1.0f - outerRadius / halfMinDim;
 
                 FillInOverstrokeVerts(&verts, bounds, outerRadius, halfMinDim,
-                                      xOffset, halfMinDim, color);
+                                      xOffset, halfMinDim, -1.0f, color);
             }
 
             const uint16_t* primIndices = rrect_type_to_indices(args.fType);