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/pipeline/skia/SkiaVulkanPipeline.cpp

diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
index d06dba0..fd0a8e0 100644
--- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "pipeline/skia/SkiaVulkanPipeline.h"
+#include "SkiaVulkanPipeline.h"
 
 #include <GrDirectContext.h>
 #include <GrTypes.h>
@@ -28,10 +28,10 @@
 #include "DeferredLayerUpdater.h"
 #include "LightingInfo.h"
 #include "Readback.h"
-#include "pipeline/skia/ShaderCache.h"
-#include "pipeline/skia/SkiaGpuPipeline.h"
-#include "pipeline/skia/SkiaProfileRenderer.h"
-#include "pipeline/skia/VkInteropFunctorDrawable.h"
+#include "ShaderCache.h"
+#include "SkiaPipeline.h"
+#include "SkiaProfileRenderer.h"
+#include "VkInteropFunctorDrawable.h"
 #include "renderstate/RenderState.h"
 #include "renderthread/Frame.h"
 #include "renderthread/IRenderPipeline.h"
@@ -42,8 +42,7 @@
 namespace uirenderer {
 namespace skiapipeline {
 
-SkiaVulkanPipeline::SkiaVulkanPipeline(renderthread::RenderThread& thread)
-        : SkiaGpuPipeline(thread) {
+SkiaVulkanPipeline::SkiaVulkanPipeline(renderthread::RenderThread& thread) : SkiaPipeline(thread) {
     thread.renderState().registerContextCallback(this);
 }