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

Commit 5f5df97d authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Fix save count offsetting within DisplayList chunks" into lmp-dev

parents e0166059 c166b6c4

libs/hwui/RenderNode.cpp

+2 −2
Original line number Diff line number Diff line
@@ -872,6 +872,8 @@ void RenderNode::issueOperations(OpenGLRenderer& renderer, T& handler) { 
            handler(new (alloc) DrawLayerOp(mLayer, 0, 0),

                    renderer.getSaveCount() - 1, properties().getClipToBounds());

        } else {

            const int saveCountOffset = renderer.getSaveCount() - 1;

            const int projectionReceiveIndex = mDisplayListData->projectionReceiveIndex;

            DisplayListLogBuffer& logBuffer = DisplayListLogBuffer::getInstance();

            for (size_t chunkIndex = 0; chunkIndex < mDisplayListData->getChunks().size(); chunkIndex++) {

                const DisplayListData::Chunk& chunk = mDisplayListData->getChunks()[chunkIndex];
@@ -882,8 +884,6 @@ void RenderNode::issueOperations(OpenGLRenderer& renderer, T& handler) { 
                issueOperationsOf3dChildren(kNegativeZChildren,

                        initialTransform, zTranslatedNodes, renderer, handler);



                const int saveCountOffset = renderer.getSaveCount() - 1;

                const int projectionReceiveIndex = mDisplayListData->projectionReceiveIndex;



                for (int opIndex = chunk.beginOpIndex; opIndex < chunk.endOpIndex; opIndex++) {

                    DisplayListOp *op = mDisplayListData->displayListOps[opIndex];