From 825d4d798aed471ceff48fcb03667b268bc15a83 Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Tue, 30 Jan 2018 20:37:03 +0000 Subject: Revert "Reduce the amount of padding needed for SDFs, take 2" This reverts commit 10105308dc86dccd3d4a0c8b9863d7c749440b21. Reason for revert: Crashing in dm on Chromecast, looks like on dftext gm. Seeing shape drop-outs in persp_shaders_bw on IntelBayTrail in gldft mode (second column, third and fourth rows). Original change's description: > Reduce the amount of padding needed for SDFs, take 2 > > SDF glyphs and paths were padded by 4 pixels, and had an inset of 2 > pixels within that for rendering the shape. We should be able to > use a pad of 2, and outset the original bounds by one texel. This allows us > to increase the maximum size in the atlas. > > Change-Id: I06b229c7a3bc907d75d320461320d0b588f9a77c > Reviewed-on: https://skia-review.googlesource.com/101843 > Reviewed-by: Brian Salomon > Commit-Queue: Jim Van Verth TBR=jvanverth@google.com,bsalomon@google.com Change-Id: Iaedb48645027db8a84970571e82edc1f878592ed No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/102040 Reviewed-by: Jim Van Verth Commit-Queue: Jim Van Verth --- src/core/SkDistanceFieldGen.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/SkDistanceFieldGen.h b/src/core/SkDistanceFieldGen.h index 16ed00ab5a..5e7af52a54 100644 --- a/src/core/SkDistanceFieldGen.h +++ b/src/core/SkDistanceFieldGen.h @@ -12,10 +12,11 @@ // the max magnitude for the distance field // distance values are limited to the range (-SK_DistanceFieldMagnitude, SK_DistanceFieldMagnitude] #define SK_DistanceFieldMagnitude 4 -// we need to pad around the original glyph to allow for bilerp sampling -#define SK_DistanceFieldPad 2 -// the rect we render with is inset from the SDF size -#define SK_DistanceFieldInset 1 +// we need to pad around the original glyph to allow our maximum distance of +// SK_DistanceFieldMagnitude texels away from any edge +#define SK_DistanceFieldPad 4 +// the rect we render with is inset from the distance field glyph size to allow for bilerp +#define SK_DistanceFieldInset 2 // For the fragment shader: // The distance field is constructed as unsigned char values, -- cgit v1.2.3