Add support for multiple base distance field sizes.

src/gpu/GrDistanceFieldTextContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDistanceFieldTextContext.h"
 #include "GrAtlas.h"
 #include "GrDrawTarget.h"
 #include "GrDrawTargetCaps.h"
 #include "GrFontScaler.h"
 #include "SkGlyphCache.h"
 #include "GrIndexBuffer.h"
 #include "GrTextStrike.h"
 #include "GrTextStrike_impl.h"
 #include "SkDraw.h"
 #include "SkGpuDevice.h"
 #include "SkPath.h"
 #include "SkRTConf.h"
 #include "SkStrokeRec.h"
 #include "effects/GrDistanceFieldTextureEffect.h"
 
 static const int kGlyphCoordsAttributeIndex = 1;
 
-static const int kBaseDFFontSize = 32;
+static const int kSmallDFFontSize = 32;
+static const int kSmallDFFontLimit = 32;
+static const int kMediumDFFontSize = 64;
+static const int kMediumDFFontLimit = 64;
+static const int kLargeDFFontSize = 128;

[robertphillips, 2014/04/01 17:55:43]

Do we need kLargeDFFontLimit?

[jvanverth1, 2014/04/01 18:06:06]

Done.

+static const int kLargeDFFontLimit = 256;  // 128 pt can scale up better than 32 or 64
 
 SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
                 "Dump the contents of the font cache before every purge.");
 
 #if SK_FORCE_DISTANCEFIELD_FONTS
 static const bool kForceDistanceFieldFonts = true;
 #else

[robertphillips, 2014/04/01 17:55:43]

Are we ready for this?

[jvanverth1, 2014/04/01 18:06:06]

Whoops, reverted.

-static const bool kForceDistanceFieldFonts = false;
+static const bool kForceDistanceFieldFonts = true;
 #endif
 
 GrDistanceFieldTextContext::GrDistanceFieldTextContext(GrContext* context,
                                                        const SkDeviceProperties& properties)
                                                     : GrTextContext(context, properties) {
     fStrike = NULL;
 
     fCurrTexture = NULL;
     fCurrVertex = 0;
 
@@ skipping 251 matching lines @@
     GrTextContext::init(paint, skPaint);
 
     fStrike = NULL;
 
     fCurrTexture = NULL;
     fCurrVertex = 0;
 
     fVertices = NULL;
     fMaxVertices = 0;
 
-    fTextRatio = fSkPaint.getTextSize()/kBaseDFFontSize;
+    if (fSkPaint.getTextSize() <= kSmallDFFontLimit) {
+        fTextRatio = fSkPaint.getTextSize()/kSmallDFFontSize;
+        fSkPaint.setTextSize(SkIntToScalar(kSmallDFFontSize));
+    } else if (fSkPaint.getTextSize() <= kMediumDFFontLimit) {
+        fTextRatio = fSkPaint.getTextSize()/kMediumDFFontSize;
+        fSkPaint.setTextSize(SkIntToScalar(kMediumDFFontSize));
+    } else {
+        fTextRatio = fSkPaint.getTextSize()/kLargeDFFontSize;
+        fSkPaint.setTextSize(SkIntToScalar(kLargeDFFontSize));
+    }
 
-    fSkPaint.setTextSize(SkIntToScalar(kBaseDFFontSize));
     fSkPaint.setLCDRenderText(false);
     fSkPaint.setAutohinted(false);
     fSkPaint.setSubpixelText(true);
 }
 
 inline void GrDistanceFieldTextContext::finish() {
     flushGlyphs();
 
     GrTextContext::finish();
 }
@@ skipping 130 matching lines @@
                                       SkScalarToFixed(y) - (glyph.fAdvanceY >> alignShift)
                                         + SK_FixedHalf, //d1g.fHalfSampleY,
                                       fontScaler);
             }
             pos += scalarsPerPosition;
         }
     }
 
     this->finish();
 }