Quite a few things going on in this commit: - Enable bitmap strikes by default in Paint objects. The SkPaint parameter that enables bitmap strikes was not previously included in DEFAULT_PAINT_FLAGS. This effectively disabled bitmap fonts. Oops! It's for the best, though, as additional work was needed in Skia to make bitmap fonts work anyway. - Complain if TEXTURE_BORDER_SIZE is not 1. Our glyph cache code does not currently handle any value other than 1 here, including zero. I've added a little C preprocessor check to prevent future engineers (including especially future-me) from thinking that they can change this value without updating the related code. - Add GL_RGBA support to hwui's FontRenderer and friends This also happened to involve some refactoring for convenience and cleanliness. Bug: 9577689 Change-Id: I0abd1e5a0d6623106247fb6421787e2c2f2ea19c
64 lines
2.0 KiB
C
64 lines
2.0 KiB
C
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_HWUI_FONT_UTIL_H
|
|
#define ANDROID_HWUI_FONT_UTIL_H
|
|
|
|
#include <SkUtils.h>
|
|
|
|
#include "Properties.h"
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// Defines
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#define DEFAULT_TEXT_SMALL_CACHE_WIDTH 1024
|
|
#define DEFAULT_TEXT_SMALL_CACHE_HEIGHT 512
|
|
#define DEFAULT_TEXT_LARGE_CACHE_WIDTH 2048
|
|
#define DEFAULT_TEXT_LARGE_CACHE_HEIGHT 512
|
|
|
|
#define TEXTURE_BORDER_SIZE 1
|
|
#if TEXTURE_BORDER_SIZE != 1
|
|
# error TEXTURE_BORDER_SIZE other than 1 is not currently supported
|
|
#endif
|
|
|
|
#define CACHE_BLOCK_ROUNDING_SIZE 4
|
|
|
|
#if RENDER_TEXT_AS_GLYPHS
|
|
typedef uint16_t glyph_t;
|
|
#define TO_GLYPH(g) g
|
|
#define GET_METRICS(paint, glyph, matrix) paint->getGlyphMetrics(glyph, matrix)
|
|
#define GET_GLYPH(text) nextGlyph((const uint16_t**) &text)
|
|
#define IS_END_OF_STRING(glyph) false
|
|
|
|
static glyph_t nextGlyph(const uint16_t** srcPtr) {
|
|
const uint16_t* src = *srcPtr;
|
|
glyph_t g = *src++;
|
|
*srcPtr = src;
|
|
return g;
|
|
}
|
|
#else
|
|
typedef SkUnichar glyph_t;
|
|
#define TO_GLYPH(g) ((SkUnichar) g)
|
|
#define GET_METRICS(paint, glyph, matrix) paint->getUnicharMetrics(glyph, matrix)
|
|
#define GET_GLYPH(text) SkUTF16_NextUnichar((const uint16_t**) &text)
|
|
#define IS_END_OF_STRING(glyph) glyph < 0
|
|
#endif
|
|
|
|
#define AUTO_KERN(prev, next) (((next) - (prev) + 32) >> 6 << 16)
|
|
|
|
#endif // ANDROID_HWUI_FONT_UTIL_H
|