commit d19875ff379935a2ac1f93c2b2e0ce675195f257
author Kevin Lubick <kjlubick@google.com> Wed Sep 27 15:02:47 2023 +0000
committer Kevin Lubick <kjlubick@google.com> Wed Sep 27 16:51:40 2023 +0000
tree a16455f03d3923a5a48d432a9a4c44dd7135bf66
parent a22dbac767b580ecb55a0adc93b0296b0f7cd432

[native] Use newer GrDirectContexts::MakeGL

This was added in https://skia-review.googlesource.com/c/skia/+/760017 and the old versions were deprecated.

Change-Id: I41ec95164e623e53451bcf050c55a136a2630ee8
Bug: b/293490566

libs/renderengine/skia/SkiaGLRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index cc1d12b..2053c6a 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -27,6 +27,7 @@
 #include <GrTypes.h>
 #include <android-base/stringprintf.h>
 #include <gl/GrGLInterface.h>
+#include <include/gpu/ganesh/gl/GrGLDirectContext.h>
 #include <gui/TraceUtils.h>
 #include <sync/sync.h>
 #include <ui/DebugUtils.h>
@@ -299,10 +300,10 @@
     LOG_ALWAYS_FATAL_IF(!glInterface.get(), "GrGLMakeNativeInterface() failed");
 
     SkiaRenderEngine::Contexts contexts;
-    contexts.first = GrDirectContext::MakeGL(glInterface, options);
+    contexts.first = GrDirectContexts::MakeGL(glInterface, options);
     if (supportsProtectedContentImpl()) {
         useProtectedContextImpl(GrProtected::kYes);
-        contexts.second = GrDirectContext::MakeGL(glInterface, options);
+        contexts.second = GrDirectContexts::MakeGL(glInterface, options);
         useProtectedContextImpl(GrProtected::kNo);
     }