More GrSurfaceProxy-clean up

Split out of: https://skia-review.googlesource.com/c/10484/ (Omnibus: Push instantiation of GrTextures later (post TextureSampler))

Change-Id: I1ee39a23c749e420dce0ad561ee1c8b09bdcc763
Reviewed-on: https://skia-review.googlesource.com/10485
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

2 files changed, 4 insertions, 22 deletions

diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index ea4f4228fd..bd9c079fa0 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -430,7 +430,6 @@ private:
      * of effects that make a readToUPM->writeToPM->readToUPM cycle invariant. Otherwise, they
      * return NULL. They also can perform a swizzle as part of the draw.
      */
-    sk_sp<GrFragmentProcessor> createPMToUPMEffect(GrTexture*, const SkMatrix&);
     sk_sp<GrFragmentProcessor> createPMToUPMEffect(sk_sp<GrTextureProxy>, const SkMatrix&);
     sk_sp<GrFragmentProcessor> createUPMToPMEffect(sk_sp<GrTextureProxy>, const SkMatrix&);
     /** Called before either of the above two functions to determine the appropriate fragment
diff --git a/include/gpu/GrCoordTransform.h b/include/gpu/GrCoordTransform.h
index 6df6586c7a..368c39e1d9 100644
--- a/include/gpu/GrCoordTransform.h
+++ b/include/gpu/GrCoordTransform.h
@@ -31,16 +31,10 @@ public:
     }
 
     /**
-     * Create a transformation that maps [0, 1] to a texture's boundaries. The precision is inferred
-     * from the texture size and filter. The texture origin also implies whether a y-reversal should
+     * Create a transformation that maps [0, 1] to a proxy's boundaries. The precision is inferred
+     * from the proxy size and filter. The proxy origin also implies whether a y-reversal should
      * be performed.
      */
-    GrCoordTransform(const GrTexture* texture, GrSamplerParams::FilterMode filter) {
-        SkASSERT(texture);
-        SkDEBUGCODE(fInProcessor = false);
-        this->reset(SkMatrix::I(), texture, filter);
-    }
-
     GrCoordTransform(GrResourceProvider* resourceProvider, GrTextureProxy* proxy,
                      GrSamplerParams::FilterMode filter) {
         SkASSERT(proxy);
@@ -49,16 +43,9 @@ public:
     }
 
     /**
-     * Create a transformation from a matrix. The precision is inferred from the texture size and
-     * filter. The texture origin also implies whether a y-reversal should be performed.
+     * Create a transformation from a matrix. The precision is inferred from the proxy size and
+     * filter. The proxy origin also implies whether a y-reversal should be performed.
      */
-    GrCoordTransform(const SkMatrix& m, const GrTexture* texture,
-                     GrSamplerParams::FilterMode filter) {
-        SkASSERT(texture);
-        SkDEBUGCODE(fInProcessor = false);
-        this->reset(m, texture, filter);
-    }
-
     GrCoordTransform(GrResourceProvider* resourceProvider, const SkMatrix& m,
                      GrTextureProxy* proxy, GrSamplerParams::FilterMode filter) {
         SkASSERT(proxy);
@@ -74,10 +61,6 @@ public:
         this->reset(m, precision);
     }
 
-    // MDB TODO: rm the GrTexture* flavor of reset
-    void reset(const SkMatrix&, const GrTexture*, GrSamplerParams::FilterMode filter,
-               bool normalize = true);
-
     void reset(GrResourceProvider*, const SkMatrix&, GrTextureProxy*,
                GrSamplerParams::FilterMode filter, bool normalize = true);