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

Commit 20a6b3b9 authored by Romain Guy's avatar Romain Guy Committed by The Android Automerger
Browse files

Round scale factors to rasterize text 

Harder, better, faster, stronger.

Change-Id: Iee4125de98c4e61603f56bb7f06002cc86458214
parent d9a80b49

libs/hwui/DisplayList.cpp

+1 −2
Original line number Diff line number Diff line
@@ -442,9 +442,8 @@ status_t DisplayList::replay(OpenGLRenderer& renderer, Rect& dirty, int32_t flag 
    for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {

        DisplayListOp *op = mDisplayListData->displayListOps[i];

#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS

        Caches::getInstance().eventMark(strlen(op->name()), op->name());

        renderer.eventMark(strlen(op->name()), op->name());

#endif



        drawGlStatus |= op->replay(renderer, dirty, flags,

                saveCount, level, mCaching, mMultipliedAlpha, deferredList);

        logBuffer.writeCommand(level, op->name());

libs/hwui/font/Font.cpp

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ Font::FontDescription::FontDescription(const SkPaint* paint, const mat4& matrix) 
    mStrokeWidth = paint->getStrokeWidth();

    mAntiAliasing = paint->isAntiAlias();

    mLookupTransform.reset();

    mLookupTransform[SkMatrix::kMScaleX] = matrix[mat4::kScaleX];

    mLookupTransform[SkMatrix::kMScaleY] = matrix[mat4::kScaleY];

    mLookupTransform[SkMatrix::kMScaleX] = roundf(fmaxf(1.0f, matrix[mat4::kScaleX]));

    mLookupTransform[SkMatrix::kMScaleY] = roundf(fmaxf(1.0f, matrix[mat4::kScaleY]));

    if (!mLookupTransform.invert(&mInverseLookupTransform)) {

        ALOGW("Could not query the inverse lookup transform for this font");

    }