AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust distance field glyph and font atlas sizes to maximize storage.

Browse Source 
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

Review URL: https://codereview.chromium.org/986343002
This commit is contained in:
jvanverth 2015-03-10 06:53:28 -07:00 committed by Commit bot
parent eb1514154d
commit 07e245ffe1
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gpu/GrDistanceFieldTextContext.cpp
View File

@ -10,6 +10,7 @@
#include "GrBitmapTextContext.h"
#include "GrDrawTarget.h"
#include "GrDrawTargetCaps.h"
#include "GrFontAtlasSizes.h"
#include "GrFontCache.h"
#include "GrFontScaler.h"
#include "GrGpu.h"
@ -33,9 +34,10 @@ SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
static const int kSmallDFFontSize = 32;
static const int kSmallDFFontLimit = 32;
static const int kMediumDFFontSize = 78;
static const int kMediumDFFontLimit = 78;
static const int kLargeDFFontSize = 192;
static const int kMediumDFFontSize = 70;
static const int kMediumDFFontLimit = 70;
static const int kLargeDFFontSize = 156;
SK_COMPILE_ASSERT(GR_SDF_MAX_SIZE >= kLargeDFFontSize, sdf_too_big);
static const int kVerticesPerGlyph = 4;
static const int kIndicesPerGlyph = 6;

25
src/gpu/GrFontAtlasSizes.h
View File

@ -9,20 +9,27 @@
#ifndef GrFontAtlasSizes_DEFINED
#define GrFontAtlasSizes_DEFINED
#define GR_FONT_ATLAS_TEXTURE_WIDTH 1024
#define GR_FONT_ATLAS_TEXTURE_HEIGHT 2048
#include "SkDistanceFieldGen.h"
#define GR_FONT_ATLAS_PLOT_WIDTH 256
#define GR_FONT_ATLAS_PLOT_HEIGHT 256
#define GR_SDF_MAX_SIZE 156
#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)
// 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);
// one over width and height
#define GR_FONT_ATLAS_RECIP_WIDTH "0.0009765625"
#define GR_FONT_ATLAS_RECIP_HEIGHT "0.00048828125"
#define GR_FONT_ATLAS_RECIP_WIDTH "0.00060975609"
#define GR_FONT_ATLAS_RECIP_HEIGHT "0.00050813008"
// 1/(3*width)
#define GR_FONT_ATLAS_LCD_DELTA "0.00032552083"
#define GR_FONT_ATLAS_LCD_DELTA "0.00020325203"
#endif