diff options
| author | Romain Guy <romainguy@google.com> | 2011-12-05 11:53:26 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2011-12-05 11:53:26 -0800 |
| commit | 8f9a9f61ab793d9387a5942b307e74324704893b (patch) | |
| tree | 999b4e35822f96473165bf861d5c7e908f19140f /libs/hwui/ShapeCache.h | |
| parent | cac5fd3e09e9dc918753d4aff624bf29a367ade3 (diff) | |
| download | frameworks_base-8f9a9f61ab793d9387a5942b307e74324704893b.zip frameworks_base-8f9a9f61ab793d9387a5942b307e74324704893b.tar.gz frameworks_base-8f9a9f61ab793d9387a5942b307e74324704893b.tar.bz2 | |
Clip text correctly
Bug #5706056
A newly introduced optimization relied on the display list renderer
to properly measure text to perform fast clipping. The paint used
to measure text needs to have AA and glyph id encoding set to return
the correct results. Unfortunately these properties were set by
the GL renderer and not by the display list renderer. This change
simply sets the properties in the display list renderer instead.
This change also improves the error message printed out when the
application attempts to use a bitmap larger than the max texture
size.
Change-Id: I4d84e1c7d194aed9ad476f69434eaa2c8f3836a8
Diffstat (limited to 'libs/hwui/ShapeCache.h')
| -rw-r--r-- | libs/hwui/ShapeCache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/ShapeCache.h b/libs/hwui/ShapeCache.h index 8b88d30..f64c074 100644 --- a/libs/hwui/ShapeCache.h +++ b/libs/hwui/ShapeCache.h @@ -503,7 +503,8 @@ PathTexture* ShapeCache<Entry>::addTexture(const Entry& entry, const SkPath *pat const uint32_t height = uint32_t(pathHeight + offset * 2.0 + 0.5); if (width > mMaxTextureSize || height > mMaxTextureSize) { - LOGW("Shape %s too large to be rendered into a texture", mName); + LOGW("Shape %s too large to be rendered into a texture (%dx%d, max=%dx%d)", + mName, width, height, mMaxTextureSize, mMaxTextureSize); return NULL; } |