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

Commit dec730fd authored by Bo Liu's avatar Bo Liu
Browse files

Enable vulkan webview draw functor 

Bug: 115613038
Test: Webview with vulkan enabled works
Change-Id: Ia450e93925ea04ff13d6e1731618a16862c66539
parent 3eee2c51

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

+1 −3
Original line number Diff line number Diff line
@@ -138,10 +138,8 @@ 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<VkInteropFunctorDrawable>(functor, asSkCanvas());

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

    } else {

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

    }

native/webview/plat_support/draw_functor.cpp

+0 −3
Original line number Diff line number Diff line
@@ -163,9 +163,6 @@ 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;