commit 6d344c3069b69a9f931924e6748038bfa49e7cf7
author Robert Phillips <robertphillips@google.com> Mon Jul 06 10:56:46 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 06 15:45:12 2020 +0000
tree 50a33997cf9af7dae9f19e9bb4c394429206e8e4
parent 81559768775934315aba4ec21854ecb29075e22a

Update unit tests to accept GrDirectContext

This CL makes it explicit that the unit tests always get a direct context.

It is mainly a mechanical CL.

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

tests/VkDrawableTest.cpp

diff --git a/tests/VkDrawableTest.cpp b/tests/VkDrawableTest.cpp
index a2367eb..d3e6e8f 100644
--- a/tests/VkDrawableTest.cpp
+++ b/tests/VkDrawableTest.cpp
@@ -16,6 +16,7 @@
 #include "include/core/SkDrawable.h"
 #include "include/core/SkSurface.h"
 #include "include/gpu/GrBackendDrawableInfo.h"
+#include "include/gpu/GrDirectContext.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/vk/GrVkGpu.h"
 #include "src/gpu/vk/GrVkInterface.h"
@@ -263,7 +264,7 @@
 }
 
 DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkDrawableTest, reporter, ctxInfo) {
-    draw_drawable_test(reporter, ctxInfo.grContext(), nullptr);
+    draw_drawable_test(reporter, ctxInfo.directContext(), nullptr);
 }
 
 DEF_GPUTEST(VkDrawableImportTest, reporter, options) {
@@ -277,14 +278,14 @@
         sk_gpu_test::ContextInfo ctxInfo = factory.getContextInfo(contextType);
         skiatest::ReporterContext ctx(
                    reporter, SkString(sk_gpu_test::GrContextFactory::ContextTypeName(contextType)));
-        if (ctxInfo.grContext()) {
+        if (ctxInfo.directContext()) {
             sk_gpu_test::ContextInfo child =
                     factory.getSharedContextInfo(ctxInfo.directContext(), 0);
-            if (!child.grContext()) {
+            if (!child.directContext()) {
                 continue;
             }
 
-            draw_drawable_test(reporter, ctxInfo.grContext(), child.grContext());
+            draw_drawable_test(reporter, ctxInfo.directContext(), child.directContext());
         }
     }
 }