Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Enable vulkan webview draw functor""

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-05 01:15:34 +00:00
committed by Android (Google) Code Review
parent 2ce83543e9 a2b2535bd7
commit 30780a26f4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
View File

@@ -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());
}

3
native/webview/plat_support/draw_functor.cpp
View File

@@ -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;