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

Commit 09147fbd authored by Romain Guy's avatar Romain Guy
Browse files

Add support for text culling. 

Change-Id: Ibf0adacdc5c64d40a8000b21d7cb0797d63efe29
parent 612f8da2

libs/hwui/FontRenderer.cpp

+13 −24
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ void Font::drawCachedGlyph(CachedGlyphInfo* glyph, int x, int y) { 
            0, glyph->mBitmapMinU, glyph->mBitmapMinV);

}



void Font::renderUTF(SkPaint* paint, const char *text, uint32_t len, uint32_t start, int numGlyphs,

        int x, int y) {

void Font::renderUTF(SkPaint* paint, const char *text, uint32_t len, uint32_t start,

        int numGlyphs, int x, int y) {

    if (numGlyphs == 0 || text == NULL || len == 0) {

        return;

    }
@@ -110,8 +110,7 @@ void Font::renderUTF(SkPaint* paint, const char *text, uint32_t len, uint32_t st 
            drawCachedGlyph(cachedGlyph, penX, penY);

        }



        // TODO: Check how to do this conversion

        penX += SkFixedRound(cachedGlyph->mAdvanceX);

        penX += SkFixedFloor(cachedGlyph->mAdvanceX);



        // If we were given a specific number of glyphs, decrement

        if (numGlyphs > 0) {
@@ -391,18 +390,14 @@ void FontRenderer::issueDrawCommand() { 
void FontRenderer::appendMeshQuad(float x1, float y1, float z1, float u1, float v1, float x2,

        float y2, float z2, float u2, float v2, float x3, float y3, float z3, float u3, float v3,

        float x4, float y4, float z4, float u4, float v4) {

    if (x1 > mClip->right || y1 < mClip->top || x2 < mClip->left || y4 > mClip->bottom) {

        return;

    }



    const uint32_t vertsPerQuad = 4;

    const uint32_t floatsPerVert = 5;

    float *currentPos = mTextMeshPtr + mCurrentQuadIndex * vertsPerQuad * floatsPerVert;



    // TODO: Cull things that are off the screen

    //    float width = (float)mRSC->getWidth();

    //    float height = (float)mRSC->getHeight();

    //

    //    if(x1 > width || y1 < 0.0f || x2 < 0 || y4 > height) {

    //        return;

    //    }



    (*currentPos++) = x1;

    (*currentPos++) = y1;

    (*currentPos++) = z1;
@@ -439,18 +434,17 @@ void FontRenderer::setFont(uint32_t fontId, float fontSize) { 
    mCurrentFont = Font::create(this, fontId, fontSize);

}



void FontRenderer::renderText(SkPaint* paint, const char *text, uint32_t len, uint32_t startIndex,

        int numGlyphs, int x, int y) {

void FontRenderer::renderText(SkPaint* paint, const Rect* clip, const char *text, uint32_t len,

        uint32_t startIndex, int numGlyphs, int x, int y) {

    checkInit();



    // Render code here

    Font *currentFont = mCurrentFont;

    if (!currentFont) {

        LOGE("Unable to initialize any fonts");

    if (!mCurrentFont) {

        LOGE("No font set");

        return;

    }



    currentFont->renderUTF(paint, text, len, startIndex, numGlyphs, x, y);

    mClip = clip;

    mCurrentFont->renderUTF(paint, text, len, startIndex, numGlyphs, x, y);



    if (mCurrentQuadIndex != 0) {

        issueDrawCommand();
@@ -458,10 +452,5 @@ void FontRenderer::renderText(SkPaint* paint, const char *text, uint32_t len, ui 
    }

}



void FontRenderer::renderText(SkPaint* paint, const char *text, int x, int y) {

    size_t textLen = strlen(text);

    renderText(paint, text, textLen, 0, -1, x, y);

}



}; // namespace uirenderer

}; // namespace android

libs/hwui/FontRenderer.h

+7 −10
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 


#include <GLES2/gl2.h>



#include "Rect.h"



namespace android {

namespace uirenderer {
@@ -35,9 +37,6 @@ class Font { 
public:

    ~Font();



    // Pointer to the utf data, length of data, where to start, number of glyphs ot read

    // (each glyph may be longer than a char because we are dealing with utf data)

    // Last two variables are the initial pen position

    void renderUTF(SkPaint* paint, const char *text, uint32_t len, uint32_t start,

            int numGlyphs, int x, int y);
@@ -91,9 +90,8 @@ public: 
    void deinit();



    void setFont(uint32_t fontId, float fontSize);

    void renderText(SkPaint* paint, const char *text, uint32_t len, uint32_t startIndex,

            int numGlyphs, int x, int y);

    void renderText(SkPaint* paint, const char *text, int x, int y);

    void renderText(SkPaint* paint, const Rect* clip, const char *text, uint32_t len,

            uint32_t startIndex, int numGlyphs, int x, int y);



    GLuint getTexture() {

        checkInit();
@@ -140,7 +138,6 @@ protected: 
    }



    void initTextTexture();



    bool cacheBitmap(const SkGlyph& glyph, uint32_t *retOriginX, uint32_t *retOriginY);



    void flushAllAndInvalidate();
@@ -149,7 +146,6 @@ protected: 
    void checkInit();



    void issueDrawCommand();



    void appendMeshQuad(float x1, float y1, float z1, float u1, float v1, float x2, float y2,

            float z2, float u2, float v2, float x3, float y3, float z3, float u3, float v3,

            float x4, float y4, float z4, float u4, float v4);
@@ -157,10 +153,9 @@ protected: 
    uint32_t mCacheWidth;

    uint32_t mCacheHeight;



    Font* mCurrentFont;



    Vector<CacheTextureLine*> mCacheLines;



    Font* mCurrentFont;

    Vector<Font*> mActiveFonts;



    // Texture to cache glyph bitmaps
@@ -175,6 +170,8 @@ protected: 


    uint32_t mIndexBufferID;



    const Rect* mClip;



    bool mInitialized;

};

libs/hwui/OpenGLRenderer.cpp

+4 −6
Original line number Diff line number Diff line
@@ -530,11 +530,6 @@ void OpenGLRenderer::drawRect(float left, float top, float right, float bottom, 
}



void OpenGLRenderer::drawText(const char* text, int count, float x, float y, SkPaint* paint) {

    // TODO: Support paint's text alignments, proper clipping

    if (quickReject(x, y, x + 1, y +1)) {

        return;

    }



    int alpha;

    SkXfermode::Mode mode;

    getAlphaAndMode(paint, &alpha, &mode);
@@ -556,8 +551,11 @@ void OpenGLRenderer::drawText(const char* text, int count, float x, float y, SkP 
    // Always premultiplied

    glUniform4f(mDrawTextProgram->color, r, g, b, a);



    // TODO: Implement scale properly

    const Rect& clip = mSnapshot->getLocalClip();



    mFontRenderer.setFont(SkTypeface::UniqueID(paint->getTypeface()), paint->getTextSize());

    mFontRenderer.renderText(paint, text, count, 0, count, x, y);

    mFontRenderer.renderText(paint, &clip, text, count, 0, count, x, y);



    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);

}

libs/hwui/Snapshot.h

+17 −9
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ namespace uirenderer { 
 */

class Snapshot: public LightRefBase<Snapshot> {

public:

    Snapshot(): flags(0x0), previous(NULL), layer(NULL), fbo(0) { }

    Snapshot(): flags(0), previous(NULL), layer(NULL), fbo(0) { }



    /**

     * Copies the specified snapshot. Only the transform and clip rectangle
@@ -54,10 +54,11 @@ public: 
            height(s->height),

            transform(s->transform),

            clipRect(s->clipRect),

            flags(0x0),

            flags(0),

            previous(s),

            layer(NULL),

            fbo(s->fbo) {

            fbo(s->fbo),

            localClip(s->localClip) {

    }



    /**
@@ -78,6 +79,10 @@ public: 
         * Indicates that this snapshot has changed the ortho matrix.

         */

        kFlagDirtyOrtho = 0x4,

        /**

         * Indicates that the local clip should be recomputed.

         */

        kFlagDirtyLocalClip = 0x8,

    };



    /**
@@ -109,7 +114,7 @@ public: 
        }



        if (clipped) {

            flags |= Snapshot::kFlagClipSet;

            flags |= Snapshot::kFlagClipSet | Snapshot::kFlagDirtyLocalClip;

        }



        return clipped;
@@ -120,14 +125,17 @@ public: 
     */

    void setClip(float left, float top, float right, float bottom) {

        clipRect.set(left, top, right, bottom);

        flags |= Snapshot::kFlagClipSet;

        flags |= Snapshot::kFlagClipSet | Snapshot::kFlagDirtyLocalClip;

    }



    const Rect& getLocalClip() {

        if (flags & Snapshot::kFlagDirtyLocalClip) {

            mat4 inverse;

            inverse.loadInverse(transform);

            localClip.set(clipRect);

            inverse.mapRect(localClip);

            flags &= ~Snapshot::kFlagDirtyLocalClip;

        }

        return localClip;

    }

tests/HwAccelerationTest/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -116,5 +116,14 @@ 
            </intent-filter>

        </activity>



        <activity

                android:name="ListActivity"

                android:label="_List">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

                

    </application>

</manifest>