commit dbc8eeb592123619d9c5bb4b6c6225b9fd45d03b
author Robert Phillips <robertphillips@google.com> Tue Feb 21 10:04:31 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 21 16:34:11 2017 +0000
tree 053905e92d6e9ac236a2a2adecb07104e9c0e390
parent 9048851e579dffad43f0c77e15030d4fdd5377a8

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>

src/gpu/effects/GrMatrixConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 0cae0ba..fd90c72 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -294,8 +294,10 @@
 
 #if GR_TEST_UTILS
 sk_sp<GrFragmentProcessor> GrMatrixConvolutionEffect::TestCreate(GrProcessorTestData* d) {
-    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
-                                          GrProcessorUnitTest::kAlphaTextureIdx;
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx
+                                        : GrProcessorUnitTest::kAlphaTextureIdx;
+    sk_sp<GrTextureProxy> proxy = d->textureProxy(texIdx);
+
     int width = d->fRandom->nextRangeU(1, MAX_KERNEL_SIZE);
     int height = d->fRandom->nextRangeU(1, MAX_KERNEL_SIZE / width);
     SkISize kernelSize = SkISize::Make(width, height);
@@ -307,15 +309,15 @@
     SkScalar bias = d->fRandom->nextSScalar1();
     SkIPoint kernelOffset = SkIPoint::Make(d->fRandom->nextRangeU(0, kernelSize.width()),
                                            d->fRandom->nextRangeU(0, kernelSize.height()));
-    SkIRect bounds = SkIRect::MakeXYWH(d->fRandom->nextRangeU(0, d->fTextures[texIdx]->width()),
-                                       d->fRandom->nextRangeU(0, d->fTextures[texIdx]->height()),
-                                       d->fRandom->nextRangeU(0, d->fTextures[texIdx]->width()),
-                                       d->fRandom->nextRangeU(0, d->fTextures[texIdx]->height()));
+    SkIRect bounds = SkIRect::MakeXYWH(d->fRandom->nextRangeU(0, proxy->width()),
+                                       d->fRandom->nextRangeU(0, proxy->height()),
+                                       d->fRandom->nextRangeU(0, proxy->width()),
+                                       d->fRandom->nextRangeU(0, proxy->height()));
     GrTextureDomain::Mode tileMode =
             static_cast<GrTextureDomain::Mode>(d->fRandom->nextRangeU(0, 2));
     bool convolveAlpha = d->fRandom->nextBool();
     return GrMatrixConvolutionEffect::Make(d->context(),
-                                           d->textureProxy(texIdx),
+                                           std::move(proxy),
                                            bounds,
                                            kernelSize,
                                            kernel.get(),