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

Commit f7792105 authored by Sergei Vasilinetc's avatar Sergei Vasilinetc Committed by Android (Google) Code Review
Browse files

Merge "Clean up deferredLayers only onGpuContextDestroyed."

parents fbffd434 c3f13169

libs/hwui/renderstate/RenderState.cpp

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ void RenderState::onGLContextDestroyed() { 
    delete mStencil;

    mStencil = nullptr;



    destroyLayersInUpdater();

    GpuMemoryTracker::onGpuContextDestroyed();

}

libs/hwui/renderstate/RenderState.h

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,6 @@ public: 
        mActiveLayerUpdaters.erase(layerUpdater);

    }



    void destroyLayersInUpdater();



    // TODO: This system is a little clunky feeling, this could use some

    // more thinking...

    void postDecStrong(VirtualLightRefBase* object);
@@ -121,6 +119,7 @@ public: 
private:

    void interruptForFunctorInvoke();

    void resumeFromFunctorInvoke();

    void destroyLayersInUpdater();



    explicit RenderState(renderthread::RenderThread& thread);

    ~RenderState();

libs/hwui/renderthread/CanvasContext.cpp

+0 −1
Original line number Diff line number Diff line
@@ -570,7 +570,6 @@ void CanvasContext::destroyHardwareResources() { 
        }

        mRenderPipeline->onDestroyHardwareResources();

    }

    mRenderThread.renderState().destroyLayersInUpdater();

}



void CanvasContext::trimMemory(RenderThread& thread, int level) {