commit 5c082496e17d9182ab8bba175e7e312129c292e6
author Greg Daniel <egdaniel@google.com> Wed Jan 29 15:06:49 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 29 20:37:00 2020 +0000
tree 1593dcf97a19958c13514c5af1290a88e0558872
parent 8a46f766467573dc44e866a66572cf2dfb6a0477

Use views throughout gpu blur code.

Bug: skia:9556
Change-Id: I3988c8112d72d5453cf93e58542eb68b16e67e1c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/267452
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp

diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
index 35dfcd0..a318025 100644
--- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
+++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
@@ -215,7 +215,7 @@
 }
 
 GrGaussianConvolutionFragmentProcessor::GrGaussianConvolutionFragmentProcessor(
-        sk_sp<GrSurfaceProxy> proxy,
+        GrSurfaceProxyView view,
         SkAlphaType alphaType,
         Direction direction,
         int radius,
@@ -224,8 +224,8 @@
         int bounds[2])
         : INHERITED(kGrGaussianConvolutionFragmentProcessor_ClassID,
                     ModulateForSamplerOptFlags(alphaType, mode == GrTextureDomain::kDecal_Mode))
-        , fCoordTransform(proxy.get())
-        , fTextureSampler(std::move(proxy))
+        , fCoordTransform(view.proxy())
+        , fTextureSampler(std::move(view))
         , fRadius(radius)
         , fDirection(direction)
         , fMode(mode) {
@@ -333,7 +333,11 @@
     int radius = d->fRandom->nextRangeU(1, kMaxKernelRadius);
     float sigma = radius / 3.f;
 
-    return GrGaussianConvolutionFragmentProcessor::Make(std::move(proxy), at, dir, radius, sigma,
+    GrSurfaceOrigin origin = proxy->origin();
+    GrSwizzle swizzle = proxy->textureSwizzle();
+    GrSurfaceProxyView view(std::move(proxy), origin, swizzle);
+
+    return GrGaussianConvolutionFragmentProcessor::Make(std::move(view), at, dir, radius, sigma,
                                                         static_cast<GrTextureDomain::Mode>(modeIdx),
                                                         bounds);
 }