commit 342d394cbe442160c2a7edfad50442ee312578cb
author Nolan Scobie <nscobie@google.com> Thu Mar 21 16:41:39 2024 -0400
committer Nolan Scobie <nscobie@google.com> Fri Mar 22 14:21:33 2024 -0400
tree fbd4d0ee08b317b312da7c62854ea9f97a274acc
parent 1e06f2dad6c16456972227e5a94395916099a5df

Move SkiaGpuContext creation in SkiaVkRenderEngine to virtual function

Making GaneshVkRenderEngine / GraphiteVkRenderEngine handle this reduces
the need for higher-level branching.

Test: boots successfully with skiavkthreaded
Bug: b/293371537
Change-Id: I5685cb9dd7b0dc1ce3a2d538a729c255fbd6c52b

libs/renderengine/skia/SkiaVkRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaVkRenderEngine.cpp b/libs/renderengine/skia/SkiaVkRenderEngine.cpp
index 473fa0a..3715859 100644
--- a/libs/renderengine/skia/SkiaVkRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaVkRenderEngine.cpp
@@ -112,12 +112,9 @@
     sSetupVulkanInterface();
 
     SkiaRenderEngine::Contexts contexts;
-    contexts.first = SkiaGpuContext::MakeVulkan_Ganesh(sVulkanInterface.getGaneshBackendContext(),
-                                                       mSkSLCacheMonitor);
+    contexts.first = createContext(sVulkanInterface);
     if (supportsProtectedContentImpl()) {
-        contexts.second = SkiaGpuContext::MakeVulkan_Ganesh(sProtectedContentVulkanInterface
-                                                                    .getGaneshBackendContext(),
-                                                            mSkSLCacheMonitor);
+        contexts.second = createContext(sProtectedContentVulkanInterface);
     }
 
     return contexts;