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

Commit f845d184 authored by Sangkyu Lee's avatar Sangkyu Lee Committed by Steve Kondik
Browse files

Prevent calling GL functions with an invalid surface 

When destroying CanvasContext, the surface can be invalid
state. So the surface should be updated to null prior to
destroying GL resources to ensure that GL functions
are not called with an invalid surface.
Some GL implementation makes an error if GL functions
are called with an invalid surface. (Adreno 3xx)

Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294
parent a775f0fc

libs/hwui/renderthread/CanvasContext.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ CanvasContext::~CanvasContext() { 




void CanvasContext::destroy() {

void CanvasContext::destroy() {

    stopDrawing();

    stopDrawing();

    setSurface(NULL);

    freePrefetechedLayers();

    freePrefetechedLayers();

    destroyHardwareResources();

    destroyHardwareResources();

    mAnimationContext->destroy();

    mAnimationContext->destroy();
@@ -66,7 +67,6 @@ void CanvasContext::destroy() { 
        delete mCanvas;

        delete mCanvas;

        mCanvas = 0;

        mCanvas = 0;

    }

    }

    setSurface(NULL);

}

}





void CanvasContext::setSurface(ANativeWindow* window) {

void CanvasContext::setSurface(ANativeWindow* window) {