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

Commit cccd5fef authored by Kevin Lubick's avatar Kevin Lubick
Browse files

Flush GrDirectContext directly 

In http://review.skia.org/716476, Skia removed SkCanvas::flush()
so this replaces that call with a direct call to flushAndSubmit()
on the (known-to-be-non-null) GrDirectContext (the previous
behavior).

Change-Id: I6df29c328b2fcf5032d27bf65d87e50c2f04c3e0
parent 069a8da0

libs/hwui/pipeline/skia/GLFunctorDrawable.cpp

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { 
    }



    // flush will create a GrRenderTarget if not already present.

    canvas->flush();

    directContext->flushAndSubmit();



    GLuint fboID = 0;

    SkISize fboSize;
@@ -167,7 +167,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { 


        // GL ops get inserted here if previous flush is missing, which could dirty the stencil

        bool stencilWritten = SkAndroidFrameworkUtils::clipWithStencil(tmpCanvas);

        tmpCanvas->flush();  // need this flush for the single op that draws into the stencil

        directContext->flushAndSubmit();  // need this flush for the single op that draws into the stencil



        // ensure that the framebuffer that the webview will render into is bound before after we

        // draw into the stencil