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

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

Revert "Enable vulkan webview draw functor" 

This reverts commit dec730fd.

Reason for revert: b/123877499

Change-Id: I14fc562c81f5ef5dab0f5404402b64858e54e364
parent dec730fd

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

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

void SkiaRecordingCanvas::drawWebViewFunctor(int functor) {

    FunctorDrawable* functorDrawable;

    FunctorDrawable* functorDrawable;

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

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

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

        // interop is disabled.

        functorDrawable =

        functorDrawable =

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

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

    } else {

    } else {

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

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

    }

    }

native/webview/plat_support/draw_functor.cpp

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

        webview_functor_callbacks.vk.initialize = &initializeVk;

        webview_functor_callbacks.vk.draw = &drawVk;

        webview_functor_callbacks.vk.draw = &drawVk;

        webview_functor_callbacks.vk.postDraw = &postDrawVk;

        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;

        break;

    }

    }

    callbacks_initialized = true;

    callbacks_initialized = true;