From f8c434eb7a374f8a9df408c143d364683c6f40af Mon Sep 17 00:00:00 2001
From: Adlai Holler <adlai@google.com>
Date: Mon, 27 Jul 2020 11:42:45 -0400
Subject: Migrate from GrContext to GrDirectContext

This is part of an effort to distinguish between different types of
contexts in GPU Skia. When using a DeferredDisplayList (DDL)
recorder, the context you get is not a direct context and cannot
be used for operations like uploading or reading textures.

Since Android does not use DDLs, it is not directly affected by this
change but other APIs, such as SkImage::MakeFromTexture are
being migrated to require a GrDirectContext to increase sanity.

Change-Id: I9afbdf3c026a9f9cb6ad2aad904915e189e584d6
---
 libs/hwui/HardwareBitmapUploader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libs/hwui/HardwareBitmapUploader.cpp')

diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp
index c2d2ff874816..87244427a719 100644
--- a/libs/hwui/HardwareBitmapUploader.cpp
+++ b/libs/hwui/HardwareBitmapUploader.cpp
@@ -21,7 +21,7 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES3/gl3.h>
-#include <GrContext.h>
+#include <GrDirectContext.h>
 #include <SkCanvas.h>
 #include <SkImage.h>
 #include <utils/GLUtils.h>
@@ -285,7 +285,7 @@ private:
         return (image.get() != nullptr);
     }
 
-    sk_sp<GrContext> mGrContext;
+    sk_sp<GrDirectContext> mGrContext;
     renderthread::VulkanManager mVulkanManager;
     std::mutex mVkLock;
 };
-- 
cgit v1.2.3-59-g8ed1b