commit 3d0359a318abd02e32d0d8744ea8222eacfac312
author Adlai Holler <adlai@google.com> Thu Jul 09 15:35:55 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 09 20:11:22 2020 +0000
tree 51cf455d49f6c88f8ecd7a1a59754fbf97a22dd2
parent 53ee0fcac7f08cb998db9bff10d3dfd936339d5a

Migrate GrGpu to GrDirectContext

Another piece of the Great Recontexting.

Change-Id: Ib089dbdba89e25add407cf816d28c96c7e5dbc05
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301303
Commit-Queue: Adlai Holler <adlai@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrDirectContext.cpp

diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index b6cc8af..8bfb239 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -160,9 +160,10 @@
 }
 #endif
 
+// CONTEXT TODO: Make* functions should return an sk_sp<GrDirectContext>
 sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> glInterface,
                                    const GrContextOptions& options) {
-    sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kOpenGL, options));
+    auto direct = new GrDirectContext(GrBackendApi::kOpenGL, options);
 #if GR_TEST_UTILS
     if (options.fRandomGLOOM) {
         auto copy = sk_make_sp<GrGLInterface>(*glInterface);
@@ -175,7 +176,8 @@
         glInterface = std::move(copy);
     }
 #endif
-    context->fGpu = GrGLGpu::Make(std::move(glInterface), options, context.get());
+    direct->fGpu = GrGLGpu::Make(std::move(glInterface), options, direct);
+    sk_sp<GrContext> context(direct);
     if (!context->init()) {
         return nullptr;
     }
@@ -190,9 +192,10 @@
 
 sk_sp<GrContext> GrContext::MakeMock(const GrMockOptions* mockOptions,
                                      const GrContextOptions& options) {
-    sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kMock, options));
+    auto direct = new GrDirectContext(GrBackendApi::kMock, options);
 
-    context->fGpu = GrMockGpu::Make(mockOptions, options, context.get());
+    direct->fGpu = GrMockGpu::Make(mockOptions, options, direct);
+    sk_sp<GrContext> context(direct);
     if (!context->init()) {
         return nullptr;
     }
@@ -212,9 +215,10 @@
 sk_sp<GrContext> GrContext::MakeVulkan(const GrVkBackendContext& backendContext,
                                        const GrContextOptions& options) {
 #ifdef SK_VULKAN
-    sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kVulkan, options));
+    auto direct = new GrDirectContext(GrBackendApi::kVulkan, options);
 
-    context->fGpu = GrVkGpu::Make(backendContext, options, context.get());
+    direct->fGpu = GrVkGpu::Make(backendContext, options, direct);
+    sk_sp<GrContext> context(direct);
     if (!context->init()) {
         return nullptr;
     }
@@ -232,9 +236,10 @@
 }
 
 sk_sp<GrContext> GrContext::MakeMetal(void* device, void* queue, const GrContextOptions& options) {
-    sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kMetal, options));
+    auto direct = new GrDirectContext(GrBackendApi::kMetal, options);
 
-    context->fGpu = GrMtlTrampoline::MakeGpu(context.get(), options, device, queue);
+    direct->fGpu = GrMtlTrampoline::MakeGpu(direct, options, device, queue);
+    sk_sp<GrContext> context(direct);
     if (!context->init()) {
         return nullptr;
     }
@@ -251,9 +256,10 @@
 
 sk_sp<GrContext> GrContext::MakeDirect3D(const GrD3DBackendContext& backendContext,
                                          const GrContextOptions& options) {
-    sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kDirect3D, options));
+    auto direct = new GrDirectContext(GrBackendApi::kDirect3D, options);
 
-    context->fGpu = GrD3DGpu::Make(backendContext, options, context.get());
+    direct->fGpu = GrD3DGpu::Make(backendContext, options, direct);
+    sk_sp<GrContext> context(direct);
     if (!context->init()) {
         return nullptr;
     }
@@ -269,9 +275,10 @@
 }
 
 sk_sp<GrContext> GrContext::MakeDawn(const wgpu::Device& device, const GrContextOptions& options) {
-    sk_sp<GrContext> context(new GrDirectContext(GrBackendApi::kDawn, options));
+    auto direct = new GrDirectContext(GrBackendApi::kDawn, options);
 
-    context->fGpu = GrDawnGpu::Make(device, options, context.get());
+    direct->fGpu = GrDawnGpu::Make(device, options, direct);
+    sk_sp<GrContext> context(direct);
     if (!context->init()) {
         return nullptr;
     }