commit 46e366ae21891c332313c0d617af3f045cb1aa77
author Greg Daniel <egdaniel@google.com> Mon Dec 16 14:38:36 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 16 20:45:10 2019 +0000
tree 722bb8e8cf5976804ba9e40e40650858561eed07
parent 48257d74cd4d55cc74d74ee01eeb14c99f091344

Remove GrTextureContext.

This change mostly just removes GrTextureContext and switches users to
directly creating GrSurfaceContexts. Outside of updating types, the factory
functions for creating Gr*Contexts have not been updated in this but will
be done in a followup.

Change-Id: I55257568d4c096c5fb48c5e38bfa2c01b824e7b5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260289
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrSurfaceContext.h

diff --git a/src/gpu/GrSurfaceContext.h b/src/gpu/GrSurfaceContext.h
index 29e5d7f..2441e08 100644
--- a/src/gpu/GrSurfaceContext.h
+++ b/src/gpu/GrSurfaceContext.h
@@ -40,14 +40,13 @@
 
     const GrColorInfo& colorInfo() const { return fColorInfo; }
     GrSurfaceOrigin origin() const { return fOrigin; }
-    const GrSwizzle& textureSwizzle() const { return fTextureSwizzle; }
-    GrSurfaceProxyView textureSurfaceView() {
-        return { this->asSurfaceProxyRef(), fOrigin, fTextureSwizzle };
+    const GrSwizzle& readSwizzle() const { return fReadSwizzle; }
+    GrSurfaceProxyView readSurfaceView() {
+        return { this->asSurfaceProxyRef(), fOrigin, fReadSwizzle };
     }
 
-    // TODO: these two calls would be way cooler if this object had a GrSurfaceProxy pointer
-    int width() const { return this->asSurfaceProxy()->width(); }
-    int height() const { return this->asSurfaceProxy()->height(); }
+    int width() const { return fSurfaceProxy->width(); }
+    int height() const { return fSurfaceProxy->height(); }
 
     const GrCaps* caps() const;
 
@@ -76,17 +75,23 @@
     bool writePixels(const GrImageInfo& srcInfo, const void* src, size_t rowBytes, SkIPoint dstPt,
                      GrContext* direct = nullptr);
 
-    // TODO: this is virtual b.c. this object doesn't have a pointer to the wrapped GrSurfaceProxy?
-    virtual GrSurfaceProxy* asSurfaceProxy() = 0;
-    virtual const GrSurfaceProxy* asSurfaceProxy() const = 0;
-    virtual sk_sp<GrSurfaceProxy> asSurfaceProxyRef() = 0;
+    GrSurfaceProxy* asSurfaceProxy() { return fSurfaceProxy.get(); }
+    const GrSurfaceProxy* asSurfaceProxy() const { return fSurfaceProxy.get(); }
+    sk_sp<GrSurfaceProxy> asSurfaceProxyRef() { return fSurfaceProxy; }
 
-    virtual GrTextureProxy* asTextureProxy() = 0;
-    virtual const GrTextureProxy* asTextureProxy() const = 0;
-    virtual sk_sp<GrTextureProxy> asTextureProxyRef() = 0;
+    GrTextureProxy* asTextureProxy() { return fSurfaceProxy->asTextureProxy(); }
+    const GrTextureProxy* asTextureProxy() const { return fSurfaceProxy->asTextureProxy(); }
+    sk_sp<GrTextureProxy> asTextureProxyRef() {
+        return sk_ref_sp(fSurfaceProxy->asTextureProxy());
+    }
 
-    virtual GrRenderTargetProxy* asRenderTargetProxy() = 0;
-    virtual sk_sp<GrRenderTargetProxy> asRenderTargetProxyRef() = 0;
+    GrRenderTargetProxy* asRenderTargetProxy() { return fSurfaceProxy->asRenderTargetProxy(); }
+    const GrRenderTargetProxy* asRenderTargetProxy() const {
+        return fSurfaceProxy->asRenderTargetProxy();
+    }
+    sk_sp<GrRenderTargetProxy> asRenderTargetProxyRef() {
+        return sk_ref_sp(fSurfaceProxy->asRenderTargetProxy());
+    }
 
     virtual GrRenderTargetContext* asRenderTargetContext() { return nullptr; }
 
@@ -108,19 +113,21 @@
 
 protected:
     friend class GrSurfaceContextPriv;
+    friend class GrDrawingManager; // For ctor
 
-    GrSurfaceContext(GrRecordingContext*, GrColorType, SkAlphaType, sk_sp<SkColorSpace>,
-                     GrSurfaceOrigin, GrSwizzle texSwizzle);
+    GrSurfaceContext(GrRecordingContext*, sk_sp<GrSurfaceProxy>, GrColorType, SkAlphaType,
+                     sk_sp<SkColorSpace>, GrSurfaceOrigin, GrSwizzle readSwizzle);
 
     GrDrawingManager* drawingManager();
     const GrDrawingManager* drawingManager() const;
 
-    SkDEBUGCODE(virtual void validate() const = 0;)
+    SkDEBUGCODE(void validate() const;)
 
     SkDEBUGCODE(GrSingleOwner* singleOwner();)
 
     GrRecordingContext* fContext;
 
+    sk_sp<GrSurfaceProxy>  fSurfaceProxy;
     GrSurfaceOrigin fOrigin;
 
     // The rescaling step of asyncRescaleAndReadPixels[YUV420]().
@@ -145,6 +152,8 @@
 private:
     friend class GrSurfaceProxy; // for copy
 
+    SkDEBUGCODE(virtual void onValidate() const {})
+
     /**
      * Copy 'src' into the proxy backing this context. This call will not do any draw fallback.
      * Currently only writePixels and replaceRenderTarget call this directly. All other copies
@@ -167,7 +176,7 @@
     }
 
     GrColorInfo fColorInfo;
-    GrSwizzle fTextureSwizzle;
+    GrSwizzle fReadSwizzle;
 
     typedef SkRefCnt INHERITED;
 };