commit 5de8b1950422d002f9c1a1ebdf545364d7d1dcfe
author Robert Phillips <robertphillips@google.com> Wed Jul 21 17:13:05 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 22 16:47:30 2021 +0000
tree 7f4b921f43b664fcafb35b263060b828a8b4aefb
parent 391429f78b8c1d0fddd6d0d50fcc1c2bd58a3db0

Feed all top-level GPU accessors through skgpu::BaseDevice

This pulls the GPU-specific accessors off of SkCanvas and SkDevice - moving them all to skgpu::BaseDevice and SkCanvasPriv.

This will allow us to more easily change the gpu class hierarchy (esp. changing GrSurfaceDrawContext to skgpu::v1:SurfaceDrawContext) w/o churning the public API.

Bug: skia:11837
Change-Id: I4e205255706680ac58ffe40f714884c2ee7ac799
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/431036
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/SurfaceTest.cpp

diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 67a1577..aafce04 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -755,7 +755,8 @@
 
 static void test_surface_context_clear(skiatest::Reporter* reporter,
                                        GrDirectContext* dContext,
-                                       GrSurfaceContext* surfaceContext, uint32_t expectedValue) {
+                                       GrSurfaceContext* surfaceContext,
+                                       uint32_t expectedValue) {
     int w = surfaceContext->width();
     int h = surfaceContext->height();
 
@@ -803,12 +804,12 @@
             ERRORF(reporter, "Could not create GPU SkSurface.");
             return;
         }
-        auto sdc = SkCanvasPriv::TopDeviceSurfaceDrawContext(surface->getCanvas());
-        if (!sdc) {
+        auto sfc = SkCanvasPriv::TopDeviceSurfaceFillContext(surface->getCanvas());
+        if (!sfc) {
             ERRORF(reporter, "Could access surface context of GPU SkSurface.");
             return;
         }
-        test_surface_context_clear(reporter, dContext, sdc, 0x0);
+        test_surface_context_clear(reporter, dContext, sfc, 0x0);
         auto imageSurfaceCtx = makeImageSurfaceContext(surface.get());
         test_surface_context_clear(reporter, dContext, imageSurfaceCtx.get(), 0x0);
     }
@@ -822,12 +823,12 @@
             ERRORF(reporter, "Could not create GPU SkSurface.");
             return;
         }
-        auto sdc = SkCanvasPriv::TopDeviceSurfaceDrawContext(surface->getCanvas());
-        if (!sdc) {
+        auto sfc = SkCanvasPriv::TopDeviceSurfaceFillContext(surface->getCanvas());
+        if (!sfc) {
             ERRORF(reporter, "Could access surface context of GPU SkSurface.");
             return;
         }
-        test_surface_context_clear(reporter, dContext, sdc, kOrigColor.toSkColor());
+        test_surface_context_clear(reporter, dContext, sfc, kOrigColor.toSkColor());
         auto imageSurfaceCtx = makeImageSurfaceContext(surface.get());
         test_surface_context_clear(reporter, dContext, imageSurfaceCtx.get(),
                                    kOrigColor.toSkColor());