Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b982e49 authored by Victoria Lease's avatar Victoria Lease Committed by Android Git Automerger
Browse files

am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev 

* commit 'ebec4b6e':
  fix kBW_Format glyphs
parents 76bf4d6d ebec4b6e

libs/hwui/FontRenderer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp 
    Vector<CacheTexture*>* cacheTextures = NULL;

    switch (format) {

        case SkMask::kA8_Format:

        case SkMask::kBW_Format:

            cacheTextures = &mACacheTextures;

            break;

        case SkMask::kARGB32_Format:

libs/hwui/font/CacheTexture.cpp

+4 −2
Original line number Diff line number Diff line
@@ -233,9 +233,11 @@ void CacheTexture::setDirty(bool dirty) { 
bool CacheTexture::fitBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_t* retOriginY) {

    switch (glyph.fMaskFormat) {

        case SkMask::kA8_Format:

        case SkMask::kBW_Format:

            if (mFormat != GL_ALPHA) {

#if DEBUG_FONT_RENDERER

                ALOGD("fitBitmap: kA8_Format glyph cannot fit into texture format %x", mFormat);

                ALOGD("fitBitmap: texture format %x is inappropriate for monochromatic glyphs",

                        mFormat);

#endif

                return false;

            }
@@ -243,7 +245,7 @@ bool CacheTexture::fitBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_ 
        case SkMask::kARGB32_Format:

            if (mFormat != GL_RGBA) {

#if DEBUG_FONT_RENDERER

                ALOGD("fitBitmap: kARGB32_Format glyph cannot fit into texture format %x", mFormat);

                ALOGD("fitBitmap: texture format %x is inappropriate for colour glyphs", mFormat);

#endif

                return false;

            }