commit ce9663081c646a6395e272c1f74668683e2243f7
author John Reck <jreck@google.com> Mon Mar 25 19:28:29 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 25 19:28:29 2024 +0000
tree 243913c656d4bb29ec07dcfa0da0c7662cf7ae27
parent 09a38e4e8c64ccf62573da7ffbe40cef90e573ae

Revert "Create a new RenderPipeline for CPU only rendering"

This reverts commit 09a38e4e8c64ccf62573da7ffbe40cef90e573ae.

Reason for revert: b/331231487

Change-Id: If9529d7ba39edef707af50f67ca8cd4754bfe11b

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 984916c..abf64d0 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -35,8 +35,8 @@
 #include "Properties.h"
 #include "RenderThread.h"
 #include "hwui/Canvas.h"
-#include "pipeline/skia/SkiaGpuPipeline.h"
 #include "pipeline/skia/SkiaOpenGLPipeline.h"
+#include "pipeline/skia/SkiaPipeline.h"
 #include "pipeline/skia/SkiaVulkanPipeline.h"
 #include "thread/CommonPool.h"
 #include "utils/GLUtils.h"
@@ -108,7 +108,7 @@
 }
 
 void CanvasContext::prepareToDraw(const RenderThread& thread, Bitmap* bitmap) {
-    skiapipeline::SkiaGpuPipeline::prepareToDraw(thread, bitmap);
+    skiapipeline::SkiaPipeline::prepareToDraw(thread, bitmap);
 }
 
 CanvasContext::CanvasContext(RenderThread& thread, bool translucent, RenderNode* rootRenderNode,