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

Commit 5216c3b0 authored by Romain Guy's avatar Romain Guy
Browse files

Merge more 9patches 

Change-Id: If8b16af84f0ee42afc406922d15897e51d833e68
parent 756a53f4

libs/hwui/DisplayListOp.h

+3 −4
Original line number Diff line number Diff line
@@ -947,10 +947,9 @@ public: 


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

        deferInfo.batchId = DeferredDisplayList::kOpBatch_Patch;

        deferInfo.mergeId = (mergeid_t) mBitmap;

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

        deferInfo.mergeable = true;

        deferInfo.opaqueOverBounds = isOpaqueOverBounds() &&

                mBitmap->isOpaque();

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

    }



private: