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

Commit 271c7192 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Split assets atlas batches Bug #10185769"

parents 1377be0f 7f6d6b03

libs/hwui/AssetAtlas.cpp

+3 −2
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ struct DelegateTexture: public Texture { 
            bool force = false, GLenum renderTarget = GL_TEXTURE_2D) {

        mDelegate->setFilterMinMag(min, mag, bindTexture, force, renderTarget);

    }



private:

    Texture* const mDelegate;

}; // struct DelegateTexture
@@ -125,12 +126,12 @@ void AssetAtlas::createEntries(Caches& caches, int* map, int count) { 
                y / height, (y + bitmap->height()) / height);



        Texture* texture = new DelegateTexture(caches, mTexture);

        Entry* entry = new Entry(bitmap, x, y, rotated, texture, mapper, *this);



        texture->id = mTexture->id;

        texture->blend = !bitmap->isOpaque();

        texture->width = bitmap->width();

        texture->height = bitmap->height();



        Entry* entry = new Entry(bitmap, x, y, rotated, texture, mapper, *this);

        texture->uvMapper = &entry->uvMapper;



        mEntries.add(entry->bitmap, entry);

libs/hwui/AssetAtlas.h

+15 −2
Original line number Diff line number Diff line
@@ -84,11 +84,20 @@ public: 
         */

        const AssetAtlas& atlas;



        /**

         * Unique identifier used to merge bitmaps and 9-patches stored

         * in the atlas.

         */

        const void* getMergeId() const {

            return texture->blend ? &atlas.mBlendKey : &atlas.mOpaqueKey;

        }



    private:

        Entry(SkBitmap* bitmap, int x, int y, bool rotated,

                Texture* texture, const UvMapper& mapper, const AssetAtlas& atlas):

                bitmap(bitmap), x(x), y(y), rotated(rotated),

                texture(texture), uvMapper(mapper), atlas(atlas) { }

                texture(texture), uvMapper(mapper), atlas(atlas) {

        }



        ~Entry() {

            delete texture;
@@ -97,7 +106,8 @@ public: 
        friend class AssetAtlas;

    };



    AssetAtlas(): mTexture(NULL), mImage(NULL), mGenerationId(0) { }

    AssetAtlas(): mTexture(NULL), mImage(NULL), mGenerationId(0),

            mBlendKey(true), mOpaqueKey(false) { }

    ~AssetAtlas() { terminate(); }



    /**
@@ -173,6 +183,9 @@ private: 


    uint32_t mGenerationId;



    const bool mBlendKey;

    const bool mOpaqueKey;



    KeyedVector<SkBitmap*, Entry*> mEntries;

}; // class AssetAtlas

libs/hwui/DeferredDisplayList.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class Batch; 
class DrawBatch;

class MergingDrawBatch;



typedef void* mergeid_t;

typedef const void* mergeid_t;



class DeferredDisplayList {

public:

libs/hwui/DisplayListOp.h

+2 −2
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ public: 


    virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo) {

        deferInfo.batchId = DeferredDisplayList::kOpBatch_Bitmap;

        deferInfo.mergeId = getAtlasEntry() ? (mergeid_t) &mEntry->atlas : (mergeid_t) mBitmap;

        deferInfo.mergeId = getAtlasEntry() ? (mergeid_t) mEntry->getMergeId() : (mergeid_t) mBitmap;



        // Don't merge A8 bitmaps - the paint's color isn't compared by mergeId, or in

        // MergingDrawBatch::canMergeWith()
@@ -1071,7 +1071,7 @@ public: 


    virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo) {

        deferInfo.batchId = DeferredDisplayList::kOpBatch_Patch;

        deferInfo.mergeId = getAtlasEntry() ? (mergeid_t) &mEntry->atlas : (mergeid_t) mBitmap;

        deferInfo.mergeId = getAtlasEntry() ? (mergeid_t) mEntry->getMergeId() : (mergeid_t) mBitmap;

        deferInfo.mergeable = state.mMatrix.isPureTranslate() &&

                OpenGLRenderer::getXfermodeDirect(mPaint) == SkXfermode::kSrcOver_Mode;

        deferInfo.opaqueOverBounds = isOpaqueOverBounds() && mBitmap->isOpaque();