From cf51a4199835e9604aa4c8b3854306f8fbabbf33 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 8 Apr 2013 19:40:31 -0700 Subject: Introduce PixelBuffer API to enable PBOs PBOs (Pixel Buffer Objects) can be used on OpenGL ES 3.0 to perform asynchronous texture uploads to free up the CPU. This change does not enable the use of PBOs unless a specific property is set (Adreno drivers have issues with PBOs at the moment, Mali drivers work just fine.) This change also cleans up Font/FontRenderer a little bit and improves performance of drop shadows generations by using memcpy() instead of a manual byte-by-byte copy. On GL ES 2.0 devices, or when PBOs are disabled, a PixelBuffer instance behaves like a simple byte array. The extra APIs introduced for PBOs (map/unmap and bind/unbind) are pretty much no-ops for CPU pixel buffers and won't introduce any significant overhead. This change also fixes a bug with text drop shadows: if the drop shadow is larger than the max texture size, the renderer would leave the GL context in a bad state and generate 0x501 errors. This change simply skips drop shadows if they are too large. Change-Id: I2700aadb0c6093431dc5dee3d587d689190c4e23 --- libs/hwui/font/Font.cpp | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'libs/hwui/font/Font.cpp') diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp index 02c1aa1..011cfc1 100644 --- a/libs/hwui/font/Font.cpp +++ b/libs/hwui/font/Font.cpp @@ -25,11 +25,12 @@ #include #include -#include "Debug.h" #include "FontUtil.h" #include "Font.h" -#include "FontRenderer.h" -#include "Properties.h" +#include "../Debug.h" +#include "../FontRenderer.h" +#include "../PixelBuffer.h" +#include "../Properties.h" namespace android { namespace uirenderer { @@ -200,25 +201,23 @@ void Font::drawCachedGlyphTransformed(CachedGlyphInfo* glyph, int x, int y, p[3].x(), p[3].y(), u1, v1, glyph->mCacheTexture); } -void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, - uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds, const float* pos) { - int nPenX = x + glyph->mBitmapLeft; - int nPenY = y + glyph->mBitmapTop; - - uint32_t endX = glyph->mStartX + glyph->mBitmapWidth; - uint32_t endY = glyph->mStartY + glyph->mBitmapHeight; +void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, uint8_t* bitmap, + uint32_t bitmapWidth, uint32_t bitmapHeight, Rect* bounds, const float* pos) { + int dstX = x + glyph->mBitmapLeft; + int dstY = y + glyph->mBitmapTop; CacheTexture* cacheTexture = glyph->mCacheTexture; + uint32_t cacheWidth = cacheTexture->getWidth(); - const uint8_t* cacheBuffer = cacheTexture->getTexture(); - - uint32_t cacheX = 0, cacheY = 0; - int32_t bX = 0, bY = 0; - for (cacheX = glyph->mStartX, bX = nPenX; cacheX < endX; cacheX++, bX++) { - for (cacheY = glyph->mStartY, bY = nPenY; cacheY < endY; cacheY++, bY++) { - uint8_t tempCol = cacheBuffer[cacheY * cacheWidth + cacheX]; - bitmap[bY * bitmapW + bX] = tempCol; - } + uint32_t startY = glyph->mStartY * cacheWidth; + uint32_t endY = startY + (glyph->mBitmapHeight * cacheWidth); + + PixelBuffer* pixelBuffer = cacheTexture->getPixelBuffer(); + const uint8_t* cacheBuffer = pixelBuffer->map(); + + for (uint32_t cacheY = startY, bitmapY = dstY * bitmapWidth; cacheY < endY; + cacheY += cacheWidth, bitmapY += bitmapWidth) { + memcpy(&bitmap[bitmapY + dstX], &cacheBuffer[cacheY + glyph->mStartX], glyph->mBitmapWidth); } } -- cgit v1.1