diff options
| author |  jvanverth <jvanverth@google.com> | 2015-03-10 08:23:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-10 08:23:07 -0700 |
| commit | c41df8d92d885ecb71af7795b22ebc7417187f61 (patch) | |
| tree | def523df6b8d063ddf519d593bdda46a2f51ace7 /src/gpu/GrFontAtlasSizes.h | |
| parent | 7e78f3d0e7ba7cf08080d5bf978c50fd5a9f6127 (diff) | |
Revert of Adjust distance field glyph and font atlas sizes to maximize storage. (patchset #8 id:140001 of https://codereview.chromium.org/986343002/)
Reason for revert:
Still seeing bad text rendering in GMs with Nexus 2 and Nexus 3.
Original issue's description:
> Adjust distance field glyph and font atlas sizes to maximize storage.
>
> Because of high DPI devices, we need more room in the glyph
> atlas for the larger glyphs. These settings will allow 4 of
> the distance field glyphs to fit in one Plot (increasing
> the storage from 32 large glyphs to 128), and still permit
> us to handle glyphs up to a 312 point size.
>
> BUG=chromium:458791
>
> Committed: https://skia.googlesource.com/skia/+/d2737ad7dd8f4ea94a74034027014fd3d78923cb
>
> Committed: https://skia.googlesource.com/skia/+/07e245ffe1ca7f781590fcff904c2922c2269781
TBR=joshualitt@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:458791
Review URL: https://codereview.chromium.org/995863002
Diffstat (limited to 'src/gpu/GrFontAtlasSizes.h')
| -rw-r--r-- | src/gpu/GrFontAtlasSizes.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/gpu/GrFontAtlasSizes.h b/src/gpu/GrFontAtlasSizes.h index 5a1821cdce..24897e4a7a 100644 --- a/src/gpu/GrFontAtlasSizes.h +++ b/src/gpu/GrFontAtlasSizes.h @@ -9,27 +9,20 @@ #ifndef GrFontAtlasSizes_DEFINED #define GrFontAtlasSizes_DEFINED -#include "SkDistanceFieldGen.h" +#define GR_FONT_ATLAS_TEXTURE_WIDTH 1024 +#define GR_FONT_ATLAS_TEXTURE_HEIGHT 2048 -#define GR_SDF_MAX_SIZE 156 +#define GR_FONT_ATLAS_PLOT_WIDTH 256 +#define GR_FONT_ATLAS_PLOT_HEIGHT 256 -// allows us to fit four of the largest distance field glyphs -#define GR_FONT_ATLAS_PLOT_WIDTH (2*(GR_SDF_MAX_SIZE+2*SK_DistanceFieldPad)) -#define GR_FONT_ATLAS_PLOT_HEIGHT (2*(GR_SDF_MAX_SIZE+2*SK_DistanceFieldPad)) - -#define GR_FONT_ATLAS_NUM_PLOTS_X 5 -#define GR_FONT_ATLAS_NUM_PLOTS_Y 6 - -#define GR_FONT_ATLAS_TEXTURE_WIDTH (GR_FONT_ATLAS_PLOT_WIDTH*GR_FONT_ATLAS_NUM_PLOTS_X) -SK_COMPILE_ASSERT(GR_FONT_ATLAS_TEXTURE_WIDTH == 1640, font_atlas_unexpected_size); -#define GR_FONT_ATLAS_TEXTURE_HEIGHT (GR_FONT_ATLAS_PLOT_HEIGHT*GR_FONT_ATLAS_NUM_PLOTS_Y) -SK_COMPILE_ASSERT(GR_FONT_ATLAS_TEXTURE_HEIGHT == 1968, font_atlas_unexpected_size); +#define GR_FONT_ATLAS_NUM_PLOTS_X (GR_FONT_ATLAS_TEXTURE_WIDTH / GR_FONT_ATLAS_PLOT_WIDTH) +#define GR_FONT_ATLAS_NUM_PLOTS_Y (GR_FONT_ATLAS_TEXTURE_HEIGHT / GR_FONT_ATLAS_PLOT_HEIGHT) // one over width and height -#define GR_FONT_ATLAS_RECIP_WIDTH "0.00060975609" -#define GR_FONT_ATLAS_RECIP_HEIGHT "0.00050813008" +#define GR_FONT_ATLAS_RECIP_WIDTH "0.0009765625" +#define GR_FONT_ATLAS_RECIP_HEIGHT "0.00048828125" // 1/(3*width) -#define GR_FONT_ATLAS_LCD_DELTA "0.00020325203" +#define GR_FONT_ATLAS_LCD_DELTA "0.00032552083" #endif |