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

Commit 1ed30c90 authored by Chris Craik's avatar Chris Craik
Browse files

Correct save/restore match up 

bug:8480642

With the additional save/restore around the operations in flush, the
stored restore batches weren't matching up to the correct saves.

Change-Id: I2f48f19009bd97289b6973283f43dc8d3e35affd
parent 0102443c

libs/hwui/DeferredDisplayList.cpp

+6 −1
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 
namespace android {

namespace uirenderer {



// Depth of the save stack at the beginning of batch playback at flush time

#define FLUSH_SAVE_STACK_DEPTH 2



/////////////////////////////////////////////////////////////////////////////////

// Operation Batches

/////////////////////////////////////////////////////////////////////////////////
@@ -270,7 +273,7 @@ void DeferredDisplayList::addRestoreToCount(OpenGLRenderer& renderer, StateOp* o 


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



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

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

}



void DeferredDisplayList::addDrawOp(OpenGLRenderer& renderer, DrawOp* op) {
@@ -386,6 +389,8 @@ status_t DeferredDisplayList::flush(OpenGLRenderer& renderer, Rect& dirty) { 
    DrawModifiers restoreDrawModifiers = renderer.getDrawModifiers();

    renderer.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);



    // NOTE: depth of the save stack at this point, before playback, should be reflected in

    // FLUSH_SAVE_STACK_DEPTH, so that save/restores match up correctly

    status |= replayBatchList(mBatches, renderer, dirty);



    renderer.restoreToCount(1);