commit e1163cdb719d9d2bd4ab2b4ebaac3df5dbbe9b4e
author Kevin Lubick <kjlubick@google.com> Wed Sep 27 15:00:48 2023 +0000
committer Kevin Lubick <kjlubick@google.com> Wed Sep 27 16:51:26 2023 +0000
tree 043799a8e9517305d79a944f7a212721ca07d8eb
parent dd8255cf54dccb46446a7d9e7377acc09139996c

[base] Use newer GrDirectContexts::MakeGL

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

Change-Id: I8f08431966cf6205a180626763915b402bec81d6
Bug: b/293490566

libs/hwui/renderthread/RenderThread.cpp

diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 94ed06c..f76ea06 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -17,6 +17,7 @@
 #include "RenderThread.h"
 
 #include <GrContextOptions.h>
+#include <include/gpu/ganesh/gl/GrGLDirectContext.h>
 #include <android-base/properties.h>
 #include <dlfcn.h>
 #include <gl/GrGLInterface.h>
@@ -286,7 +287,7 @@
     auto glesVersion = reinterpret_cast<const char*>(glGetString(GL_VERSION));
     auto size = glesVersion ? strlen(glesVersion) : -1;
     cacheManager().configureContext(&options, glesVersion, size);
-    sk_sp<GrDirectContext> grContext(GrDirectContext::MakeGL(std::move(glInterface), options));
+    sk_sp<GrDirectContext> grContext(GrDirectContexts::MakeGL(std::move(glInterface), options));
     LOG_ALWAYS_FATAL_IF(!grContext.get());
     setGrContext(grContext);
 }