Remove GrSingleTextureEffect

Change-Id: I510cc0657f9433b206dc2ab643fa557667263294
Reviewed-on: https://skia-review.googlesource.com/27180
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

1 files changed, 12 insertions, 11 deletions

diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h
index 57e0fd9a72..a89d640b52 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.h
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.h
@@ -8,14 +8,13 @@
 #ifndef GrMatrixConvolutionEffect_DEFINED
 #define GrMatrixConvolutionEffect_DEFINED
 
-#include "GrSingleTextureEffect.h"
 #include "GrTextureDomain.h"
 
 // A little bit less than the minimum # uniforms required by DX9SM2 (32).
 // Allows for a 5x5 kernel (or 25x1, for that matter).
 #define MAX_KERNEL_SIZE 25
 
-class GrMatrixConvolutionEffect : public GrSingleTextureEffect {
+class GrMatrixConvolutionEffect : public GrFragmentProcessor {
 public:
     static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy,
                                            const SkIRect& bounds,
@@ -70,18 +69,20 @@ private:
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
-    SkIRect         fBounds;
-    SkISize         fKernelSize;
-    float           fKernel[MAX_KERNEL_SIZE];
-    float           fGain;
-    float           fBias;
-    float           fKernelOffset[2];
-    bool            fConvolveAlpha;
-    GrTextureDomain fDomain;
+    GrCoordTransform fCoordTransform;
+    GrTextureDomain  fDomain;
+    TextureSampler   fTextureSampler;
+    SkIRect          fBounds;
+    SkISize          fKernelSize;
+    float            fKernel[MAX_KERNEL_SIZE];
+    float            fGain;
+    float            fBias;
+    float            fKernelOffset[2];
+    bool             fConvolveAlpha;
 
     GR_DECLARE_FRAGMENT_PROCESSOR_TEST
 
-    typedef GrSingleTextureEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
 #endif