commit d91d2341b9eb34d46eddf449f1b74b726779b710
author Robert Phillips <robertphillips@google.com> Thu Jul 22 18:56:33 2021 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 22 18:56:51 2021 +0000
tree 9ca22a137f543d0b83b078aa0644b960abe059cf
parent ad858e76e339d37743c0c389b061f88599663ecf

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

This reverts commit 5de8b1950422d002f9c1a1ebdf545364d7d1dcfe.

Reason for revert: blocking Android roll

Original change's description:
> 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>

TBR=robertphillips@google.com,brianosman@google.com,michaelludwig@google.com

Change-Id: I8a015be4edbe21d63db09d5593af13cc89df4217
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11837
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/431538
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/BaseDevice.cpp

diff --git a/src/gpu/BaseDevice.cpp b/src/gpu/BaseDevice.cpp
index efeea35..4da8e99 100644
--- a/src/gpu/BaseDevice.cpp
+++ b/src/gpu/BaseDevice.cpp
@@ -16,13 +16,6 @@
 
 namespace skgpu {
 
-BaseDevice::BaseDevice(sk_sp<GrRecordingContext> rContext,
-                       const SkImageInfo& ii,
-                       const SkSurfaceProps& props)
-    : INHERITED(ii, props)
-    , fContext(std::move(rContext)) {
-}
-
 GrRenderTargetProxy* BaseDevice::targetProxy() {
     return this->readSurfaceView().asRenderTargetProxy();
 }

src/gpu/BaseDevice.h

diff --git a/src/gpu/BaseDevice.h b/src/gpu/BaseDevice.h
index 1427921..fbd28c5 100644
--- a/src/gpu/BaseDevice.h
+++ b/src/gpu/BaseDevice.h
@@ -11,9 +11,6 @@
 #include "include/core/SkImage.h"
 #include "include/private/GrTypesPriv.h"
 
-class GrRenderTargetProxy;
-class GrSurfaceDrawContext;
-class GrSurfaceFillContext;
 class GrSurfaceProxyView;
 
 // NOTE: when not defined, SkGpuDevice extends SkBaseDevice directly and manages its clip stack
@@ -43,20 +40,17 @@
         kUninit_InitContents
     };
 
-    BaseDevice(sk_sp<GrRecordingContext>, const SkImageInfo&, const SkSurfaceProps&);
+    BaseDevice(sk_sp<GrRecordingContext> rContext,
+               const SkImageInfo& ii,
+               const SkSurfaceProps& props)
+        : INHERITED(ii, props)
+        , fContext(std::move(rContext)) {
+    }
 
     virtual GrSurfaceProxyView readSurfaceView() = 0;
+    GrRenderTargetProxy* targetProxy() override;
 
-    BaseDevice* asGpuDevice() override { return this; }
-
-#if SK_GPU_V1
-    // TODO: make this return a skgpu::v1:SurfaceDrawContext
-    virtual GrSurfaceDrawContext* surfaceDrawContext() { return nullptr; }
-#endif
-
-    virtual GrSurfaceFillContext* surfaceFillContext() = 0;
-    GrRenderTargetProxy* targetProxy();
-    GrRecordingContext* recordingContext() const { return fContext.get(); }
+    GrRecordingContext* recordingContext() const override { return fContext.get(); }
 
     virtual bool wait(int numSemaphores,
                       const GrBackendSemaphore* waitSemaphores,

src/gpu/v1/Device.cpp

diff --git a/src/gpu/v1/Device.cpp b/src/gpu/v1/Device.cpp
index 05e23fb..b7af9cd 100644
--- a/src/gpu/v1/Device.cpp
+++ b/src/gpu/v1/Device.cpp
@@ -291,11 +291,6 @@
     return fSurfaceDrawContext.get();
 }
 
-GrSurfaceFillContext* Device::surfaceFillContext() {
-    ASSERT_SINGLE_OWNER
-    return fSurfaceDrawContext.get();
-}
-
 void Device::clearAll() {
     ASSERT_SINGLE_OWNER
     GR_CREATE_TRACE_MARKER_CONTEXT("skgpu::v1::Device", "clearAll", fContext.get());

src/gpu/v1/Device_v1.h

diff --git a/src/gpu/v1/Device_v1.h b/src/gpu/v1/Device_v1.h
index 5c7fd1e..203307a 100644
--- a/src/gpu/v1/Device_v1.h
+++ b/src/gpu/v1/Device_v1.h
@@ -106,7 +106,6 @@
 
     GrSurfaceDrawContext* surfaceDrawContext() override;
     const GrSurfaceDrawContext* surfaceDrawContext() const;
-    GrSurfaceFillContext* surfaceFillContext() override;
 
     // set all pixels to 0
     void clearAll();

src/gpu/v2/Device.cpp

diff --git a/src/gpu/v2/Device.cpp b/src/gpu/v2/Device.cpp
index bb1f365..d9bedfc 100644
--- a/src/gpu/v2/Device.cpp
+++ b/src/gpu/v2/Device.cpp
@@ -26,10 +26,6 @@
 
 GrSurfaceProxyView Device::readSurfaceView() { return {}; }
 
-GrSurfaceFillContext* Device::surfaceFillContext() {
-    return nullptr;
-}
-
 void Device::asyncRescaleAndReadPixels(const SkImageInfo& info,
                                        const SkIRect& srcRect,
                                        RescaleGamma rescaleGamma,

src/gpu/v2/Device_v2.h

diff --git a/src/gpu/v2/Device_v2.h b/src/gpu/v2/Device_v2.h
index f3f1a6e..b4431f4 100644
--- a/src/gpu/v2/Device_v2.h
+++ b/src/gpu/v2/Device_v2.h
@@ -44,8 +44,6 @@
 
     GrSurfaceProxyView readSurfaceView() override;
 
-    GrSurfaceFillContext* surfaceFillContext() override;
-
     bool wait(int numSemaphores,
               const GrBackendSemaphore* waitSemaphores,
               bool deleteSemaphoresAfterWait) override {
@@ -79,6 +77,8 @@
                                          ReadPixelsCallback,
                                          ReadPixelsContext) override;
 
+    GrSurfaceDrawContext* surfaceDrawContext() override { return nullptr; }
+
 protected:
     void onSave() override;
     void onRestore() override;