diff options
| -rw-r--r-- | libs/hwui/GammaFontRenderer.cpp | 8 | ||||
| -rw-r--r-- | libs/hwui/Properties.h | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libs/hwui/GammaFontRenderer.cpp b/libs/hwui/GammaFontRenderer.cpp index fe532ab..bd0a4b3 100644 --- a/libs/hwui/GammaFontRenderer.cpp +++ b/libs/hwui/GammaFontRenderer.cpp @@ -42,13 +42,13 @@ static int luminance(const SkPaint* paint) { GammaFontRenderer* GammaFontRenderer::createRenderer() { // Choose the best renderer char property[PROPERTY_VALUE_MAX]; - if (property_get(PROPERTY_TEXT_GAMMA_SHADER, property, DEFAULT_TEXT_GAMMA_SHADER) > 0) { - if (!strcasecmp(property, "shader")) { + if (property_get(PROPERTY_TEXT_GAMMA_METHOD, property, DEFAULT_TEXT_GAMMA_METHOD) > 0) { + if (!strcasecmp(property, "lookup")) { + return new LookupGammaFontRenderer(); + } else if (!strcasecmp(property, "shader")) { return new ShaderGammaFontRenderer(false); } else if (!strcasecmp(property, "shader3")) { return new ShaderGammaFontRenderer(true); - } else if (!strcasecmp(property, "lookup")) { - return new LookupGammaFontRenderer(); } } diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h index 447b1d0..3f3b39a 100644 --- a/libs/hwui/Properties.h +++ b/libs/hwui/Properties.h @@ -88,7 +88,8 @@ enum DebugLevel { // // See PROPERTY_TEXT_GAMMA, PROPERTY_TEXT_BLACK_GAMMA_THRESHOLD and // PROPERTY_TEXT_WHITE_GAMMA_THRESHOLD for more control. -#define PROPERTY_TEXT_GAMMA_SHADER "hwui.text_gamma_correction" +#define PROPERTY_TEXT_GAMMA_METHOD "hwui.text_gamma_correction" +#define DEFAULT_TEXT_GAMMA_METHOD "lookup" // Gamma (>= 1.0, <= 10.0) #define PROPERTY_TEXT_GAMMA "hwui.text_gamma" @@ -111,8 +112,6 @@ enum DebugLevel { #define DEFAULT_TEXTURE_CACHE_FLUSH_RATE 0.6f -#define DEFAULT_TEXT_GAMMA_SHADER "false" - #define DEFAULT_TEXT_GAMMA 1.4f #define DEFAULT_TEXT_BLACK_GAMMA_THRESHOLD 64 #define DEFAULT_TEXT_WHITE_GAMMA_THRESHOLD 192 |