Remove GrProcessorTestData's GrTextures

(No longer) Blocked on: https://skia-review.googlesource.com/c/8450/ (Remove asTextureRef from SkSpecialImage & update effects accordingly (take 2))

This also (unfortunately) picks up a few straggling effects that didn't have a sk_sp<GrTextureProxy> factory.

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

1 files changed, 4 insertions, 7 deletions

diff --git a/include/gpu/GrProcessorUnitTest.h b/include/gpu/GrProcessorUnitTest.h
index 0f7e8e8d7c..61e8b3e3ca 100644
--- a/include/gpu/GrProcessorUnitTest.h
+++ b/include/gpu/GrProcessorUnitTest.h
@@ -50,23 +50,20 @@ struct GrProcessorTestData {
                         GrContext* context,
                         const GrRenderTargetContext* renderTargetContext,
                         GrTexture* const textures[2])
-            : fRandom(random), fContext(context), fRenderTargetContext(renderTargetContext) {
-        fTextures[0] = textures[0];
-        fTextures[1] = textures[1];
-
+            : fRandom(random)
+            , fRenderTargetContext(renderTargetContext)
+            , fContext(context) {
         fProxies[0] = GrSurfaceProxy::MakeWrapped(sk_ref_sp(textures[0]));
         fProxies[1] = GrSurfaceProxy::MakeWrapped(sk_ref_sp(textures[1]));
     }
     SkRandom* fRandom;
-    GrContext* fContext;
     const GrRenderTargetContext* fRenderTargetContext;
-    GrTexture* fTextures[2];
 
     GrContext* context() { return fContext; }
-    GrTexture* texture(int index) { return fTextures[index]; }
     sk_sp<GrTextureProxy> textureProxy(int index) { return fProxies[index]; }
 
 private:
+    GrContext* fContext;
     sk_sp<GrTextureProxy> fProxies[2];
 };