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

Commit 7273daac authored by Chris Craik's avatar Chris Craik
Browse files

Fix issues related to saveLayer/restore deferral 

bug:8464795

Changes drawModifiers and alpha to be restored for all operations,
since saveLayer/restore use these values, not just draw operations

Also forces a renderer state restoration before a deferred restore op
is played back, in case it is associated with a saveLayer that
doesn't have the save_clip flag set

Change-Id: I9da5d44fefbfffdee164c98f4f139843dacf85df
parent 8ff0201a

libs/hwui/DeferredDisplayList.cpp

+17 −8
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 
        for (unsigned int i = 0; i < mOps.size(); i++) {

            DrawOp* op = mOps[i];



            renderer.restoreDisplayState(op->state, kStateDeferFlag_Draw);

            renderer.restoreDisplayState(op->state);



#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS

            renderer.eventMark(op->name());
@@ -106,7 +106,7 @@ public: 


    virtual status_t replay(OpenGLRenderer& renderer, Rect& dirty) {

        DEFER_LOGD("replaying state op batch %p", this);

        renderer.restoreDisplayState(mOp->state, 0);

        renderer.restoreDisplayState(mOp->state);



        // use invalid save count because it won't be used at flush time - RestoreToCountOp is the

        // only one to use it, and we don't use that class at flush time, instead calling
@@ -117,12 +117,12 @@ public: 
    }



private:

    StateOp* mOp;

    const StateOp* mOp;

};



class RestoreToCountBatch : public DrawOpBatch {

public:

    RestoreToCountBatch(int restoreCount) : mRestoreCount(restoreCount) {}

    RestoreToCountBatch(StateOp* op, int restoreCount) : mOp(op), mRestoreCount(restoreCount) {}



    bool intersects(Rect& rect) {

        // if something checks for intersection, it's trying to go backwards across a state op,
@@ -133,11 +133,15 @@ public: 


    virtual status_t replay(OpenGLRenderer& renderer, Rect& dirty) {

        DEFER_LOGD("batch %p restoring to count %d", this, mRestoreCount);



        renderer.restoreDisplayState(mOp->state);

        renderer.restoreToCount(mRestoreCount);

        return DrawGlInfo::kStatusDone;

    }



private:

    // we use the state storage for the RestoreToCountOp, but don't replay the op itself

    const StateOp* mOp;

    /*

     * The count used here represents the flush() time saveCount. This is as opposed to the

     * DisplayList record time, or defer() time values (which are RestoreToCountOp's mCount, and
@@ -251,7 +255,8 @@ void DeferredDisplayList::addSave(OpenGLRenderer& renderer, SaveOp* op, int newS 
 * Either will act as a barrier to draw operation reordering, as we want to play back layer

 * save/restore and complex canvas modifications (including save/restore) in order.

 */

void DeferredDisplayList::addRestoreToCount(OpenGLRenderer& renderer, int newSaveCount) {

void DeferredDisplayList::addRestoreToCount(OpenGLRenderer& renderer, StateOp* op,

        int newSaveCount) {

    DEFER_LOGD("%p addRestoreToCount %d", this, newSaveCount);



    if (recordingComplexClip() && newSaveCount <= mComplexClipStackStart) {
@@ -265,7 +270,7 @@ void DeferredDisplayList::addRestoreToCount(OpenGLRenderer& renderer, int newSav 


    while (!mSaveStack.isEmpty() && mSaveStack.top() >= newSaveCount) mSaveStack.pop();



    storeRestoreToCountBarrier(mSaveStack.size() + 1);

    storeRestoreToCountBarrier(renderer, op, mSaveStack.size() + 1);

}



void DeferredDisplayList::addDrawOp(OpenGLRenderer& renderer, DrawOp* op) {
@@ -338,11 +343,15 @@ void DeferredDisplayList::storeStateOpBarrier(OpenGLRenderer& renderer, StateOp* 
    resetBatchingState();

}



void DeferredDisplayList::storeRestoreToCountBarrier(int newSaveCount) {

void DeferredDisplayList::storeRestoreToCountBarrier(OpenGLRenderer& renderer, StateOp* op,

        int newSaveCount) {

    DEFER_LOGD("%p adding restore to count %d barrier, pos %d",

            this, newSaveCount, mBatches.size());



    mBatches.add(new RestoreToCountBatch(newSaveCount));

    // store displayState for the restore operation, as it may be associated with a saveLayer that

    // doesn't have kClip_SaveFlag set

    renderer.storeDisplayState(op->state, getStateOpDeferFlags());

    mBatches.add(new RestoreToCountBatch(op, newSaveCount));

    resetBatchingState();

}

libs/hwui/DeferredDisplayList.h

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public: 
    void addClip(OpenGLRenderer& renderer, ClipOp* op);

    void addSaveLayer(OpenGLRenderer& renderer, SaveLayerOp* op, int newSaveCount);

    void addSave(OpenGLRenderer& renderer, SaveOp* op, int newSaveCount);

    void addRestoreToCount(OpenGLRenderer& renderer, int newSaveCount);

    void addRestoreToCount(OpenGLRenderer& renderer, StateOp* op, int newSaveCount);



    /**

     * Add a draw op into the DeferredDisplayList, reordering as needed (for performance) if
@@ -81,7 +81,7 @@ private: 
    void resetBatchingState();



    void storeStateOpBarrier(OpenGLRenderer& renderer, StateOp* op);

    void storeRestoreToCountBarrier(int newSaveCount);

    void storeRestoreToCountBarrier(OpenGLRenderer& renderer, StateOp* op, int newSaveCount);



    bool recordingComplexClip() const { return mComplexClipStackStart >= 0; }

libs/hwui/DisplayListOp.h

+23 −22
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public: 
        applyState(replayStruct.mRenderer, saveCount);

    }



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) = 0;

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const = 0;

};



class DrawOp : public DisplayListOp {
@@ -223,7 +223,7 @@ public: 
        deferStruct.mDeferredList.addSave(deferStruct.mRenderer, this, newSaveCount);

    }



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.save(mFlags);

    }
@@ -251,11 +251,12 @@ public: 
            : mCount(count) {}



    virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level) {

        deferStruct.mDeferredList.addRestoreToCount(deferStruct.mRenderer, saveCount + mCount);

        deferStruct.mDeferredList.addRestoreToCount(deferStruct.mRenderer,

                this, saveCount + mCount);

        deferStruct.mRenderer.restoreToCount(saveCount + mCount);

    }



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.restoreToCount(saveCount + mCount);

    }
@@ -293,7 +294,7 @@ public: 
                mAlpha, mMode, mFlags);

    }



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.saveLayer(mArea.left, mArea.top, mArea.right, mArea.bottom, mAlpha, mMode, mFlags);

    }
@@ -330,7 +331,7 @@ public: 
    TranslateOp(float dx, float dy)

            : mDx(dx), mDy(dy) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.translate(mDx, mDy);

    }
@@ -350,7 +351,7 @@ public: 
    RotateOp(float degrees)

            : mDegrees(degrees) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.rotate(mDegrees);

    }
@@ -369,7 +370,7 @@ public: 
    ScaleOp(float sx, float sy)

            : mSx(sx), mSy(sy) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.scale(mSx, mSy);

    }
@@ -389,7 +390,7 @@ public: 
    SkewOp(float sx, float sy)

            : mSx(sx), mSy(sy) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.skew(mSx, mSy);

    }
@@ -409,7 +410,7 @@ public: 
    SetMatrixOp(SkMatrix* matrix)

            : mMatrix(matrix) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.setMatrix(mMatrix);

    }
@@ -428,7 +429,7 @@ public: 
    ConcatMatrixOp(SkMatrix* matrix)

            : mMatrix(matrix) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.concatMatrix(mMatrix);

    }
@@ -471,7 +472,7 @@ public: 
    ClipRectOp(float left, float top, float right, float bottom, SkRegion::Op op)

            : ClipOp(op), mArea(left, top, right, bottom) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.clipRect(mArea.left, mArea.top, mArea.right, mArea.bottom, mOp);

    }
@@ -500,7 +501,7 @@ public: 
    ClipPathOp(SkPath* path, SkRegion::Op op)

            : ClipOp(op), mPath(path) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.clipPath(mPath, mOp);

    }
@@ -521,7 +522,7 @@ public: 
    ClipRegionOp(SkRegion* region, SkRegion::Op op)

            : ClipOp(op), mRegion(region) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.clipRegion(mRegion, mOp);

    }
@@ -540,7 +541,7 @@ private: 


class ResetShaderOp : public StateOp {

public:

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.resetShader();

    }
@@ -555,7 +556,7 @@ class SetupShaderOp : public StateOp { 
public:

    SetupShaderOp(SkiaShader* shader)

            : mShader(shader) {}

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.setupShader(mShader);

    }
@@ -571,7 +572,7 @@ private: 


class ResetColorFilterOp : public StateOp {

public:

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.resetColorFilter();

    }
@@ -587,7 +588,7 @@ public: 
    SetupColorFilterOp(SkiaColorFilter* colorFilter)

            : mColorFilter(colorFilter) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.setupColorFilter(mColorFilter);

    }
@@ -603,7 +604,7 @@ private: 


class ResetShadowOp : public StateOp {

public:

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.resetShadow();

    }
@@ -619,7 +620,7 @@ public: 
    SetupShadowOp(float radius, float dx, float dy, int color)

            : mRadius(radius), mDx(dx), mDy(dy), mColor(color) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.setupShadow(mRadius, mDx, mDy, mColor);

    }
@@ -638,7 +639,7 @@ private: 


class ResetPaintFilterOp : public StateOp {

public:

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.resetPaintFilter();

    }
@@ -654,7 +655,7 @@ public: 
    SetupPaintFilterOp(int clearBits, int setBits)

            : mClearBits(clearBits), mSetBits(setBits) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) {

    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const {

        renderer.setupPaintFilter(mClearBits, mSetBits);

    }

libs/hwui/OpenGLRenderer.cpp

+11 −9
Original line number Diff line number Diff line
@@ -696,7 +696,10 @@ bool OpenGLRenderer::restoreSnapshot() { 
    }



    if (restoreLayer) {

        endMark(); // Savelayer

        startMark("ComposeLayer");

        composeLayer(current, previous);

        endMark();

    }



    return restoreClip;
@@ -874,6 +877,7 @@ bool OpenGLRenderer::createLayer(float left, float top, float right, float botto 
    mSnapshot->flags |= Snapshot::kFlagIsLayer;

    mSnapshot->layer = layer;



    startMark("SaveLayer");

    if (fboLayer) {

        return createFboLayer(layer, bounds, clip, previousFbo);

    } else {
@@ -1326,8 +1330,6 @@ bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDef 
        } else {

            state.mBounds.set(currentClip);

        }

        state.mDrawModifiers = mDrawModifiers;

        state.mAlpha = mSnapshot->alpha;

    }



    if (stateDeferFlags & kStateDeferFlag_Clip) {
@@ -1336,18 +1338,18 @@ bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDef 
        state.mClip.setEmpty();

    }



    // transform always deferred

    // Transform, drawModifiers, and alpha always deferred, since they are used by state operations

    // (Note: saveLayer/restore use colorFilter and alpha, so we just save restore everything)

    state.mMatrix.load(currentMatrix);

    state.mDrawModifiers = mDrawModifiers;

    state.mAlpha = mSnapshot->alpha;

    return false;

}



void OpenGLRenderer::restoreDisplayState(const DeferredDisplayState& state, int stateDeferFlags) {

void OpenGLRenderer::restoreDisplayState(const DeferredDisplayState& state) {

    currentTransform().load(state.mMatrix);



    if (stateDeferFlags & kStateDeferFlag_Draw) {

    mDrawModifiers = state.mDrawModifiers;

    mSnapshot->alpha = state.mAlpha;

    }



    if (!state.mClip.isEmpty()) {

        mSnapshot->setClip(state.mClip.left, state.mClip.top, state.mClip.right, state.mClip.bottom);

libs/hwui/OpenGLRenderer.h

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ public: 
    SkPaint* filterPaint(SkPaint* paint);



    bool storeDisplayState(DeferredDisplayState& state, int stateDeferFlags);

    void restoreDisplayState(const DeferredDisplayState& state, int stateDeferFlags);

    void restoreDisplayState(const DeferredDisplayState& state);



    const DrawModifiers& getDrawModifiers() { return mDrawModifiers; }

    void setDrawModifiers(const DrawModifiers& drawModifiers) { mDrawModifiers = drawModifiers; }