commit 3e69a659a17262949576eb20661abb3c3163a9ca
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Oct 13 14:55:46 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 13 14:55:46 2023 +0000
tree 92a2ce2e10f6d5782155d70e2ffea9c21b66db5f
parent 7dc729eb43ece1c19b20f371e1b8daf51a6753ec
parent 2fc491182c7b866838fbf1eceac55898867ee068

Merge "[native] Use newer GrDirectContexts::MakeVulkan" into main

libs/renderengine/skia/SkiaVkRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaVkRenderEngine.cpp b/libs/renderengine/skia/SkiaVkRenderEngine.cpp
index 17f263d..8821c0e 100644
--- a/libs/renderengine/skia/SkiaVkRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaVkRenderEngine.cpp
@@ -25,6 +25,7 @@
 #include <GrContextOptions.h>
 #include <vk/GrVkExtensions.h>
 #include <vk/GrVkTypes.h>
+#include <include/gpu/ganesh/vk/GrVkDirectContext.h>
 
 #include <android-base/stringprintf.h>
 #include <gui/TraceUtils.h>
@@ -603,11 +604,11 @@
     sSetupVulkanInterface();
 
     SkiaRenderEngine::Contexts contexts;
-    contexts.first = GrDirectContext::MakeVulkan(sVulkanInterface.getBackendContext(), options);
+    contexts.first = GrDirectContexts::MakeVulkan(sVulkanInterface.getBackendContext(), options);
     if (supportsProtectedContentImpl()) {
         contexts.second =
-                GrDirectContext::MakeVulkan(sProtectedContentVulkanInterface.getBackendContext(),
-                                            options);
+                GrDirectContexts::MakeVulkan(sProtectedContentVulkanInterface.getBackendContext(),
+                                             options);
     }
 
     return contexts;