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

Commit 30780a26 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Enable vulkan webview draw functor""

parents 2ce83543 a2b2535b

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

+3 −1
Original line number Diff line number Diff line
@@ -142,8 +142,10 @@ void SkiaRecordingCanvas::callDrawGLFunction(Functor* functor, 
void SkiaRecordingCanvas::drawWebViewFunctor(int functor) {

    FunctorDrawable* functorDrawable;

    if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaVulkan) {

        // TODO(cblume) use VkFunctorDrawable instead of VkInteropFunctorDrawable here when the

        // interop is disabled.

        functorDrawable =

                mDisplayList->allocateDrawable<VkFunctorDrawable>(functor, asSkCanvas());

                mDisplayList->allocateDrawable<VkInteropFunctorDrawable>(functor, asSkCanvas());

    } else {

        functorDrawable = mDisplayList->allocateDrawable<GLFunctorDrawable>(functor, asSkCanvas());

    }

native/webview/plat_support/draw_functor.cpp

+3 −0
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ int CreateFunctor(void* data, AwDrawFnFunctorCallbacks* functor_callbacks) { 
        webview_functor_callbacks.vk.initialize = &initializeVk;

        webview_functor_callbacks.vk.draw = &drawVk;

        webview_functor_callbacks.vk.postDraw = &postDrawVk;

        // TODO(boliu): Remove this once SkiaRecordingCanvas::drawWebViewFunctor

        // no longer uses GL interop.

        webview_functor_callbacks.gles.draw = &draw_gl;

        break;

    }

    callbacks_initialized = true;