commit f580721e1118407ca9f454d83eb52cbfe9ed2c3a
author Robert Phillips <robertphillips@google.com> Wed Sep 18 13:30:24 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 19 15:26:56 2019 +0000
tree 5bab840d45118778547a009b10a41bba8b86fe8e
parent 9a8b846baf43752fa8cddbfa04b19b7707580d43

Remove a usage of GrPixelConfig in SkGpuBlurUtils::GaussianBlur

Bug: skia:6718
Change-Id: Ia8a96cf6907ffaafd989f1e5bb1443d1ef51b9e6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/242142
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index b77fe5b..0ef9383 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1204,6 +1204,7 @@
                                                rect,
                                                bitmap.getGenerationID(),
                                                std::move(proxy),
+                                               SkColorTypeToGrColorType(bitmap.colorType()),
                                                bitmap.refColorSpace(),
                                                &this->surfaceProps());
 }
@@ -1217,6 +1218,7 @@
                                                    SkIRect::MakeWH(image->width(), image->height()),
                                                    image->uniqueID(),
                                                    std::move(proxy),
+                                                   SkColorTypeToGrColorType(image->colorType()),
                                                    image->refColorSpace(),
                                                    &this->surfaceProps());
     } else if (image->peekPixels(&pm)) {
@@ -1262,10 +1264,13 @@
         finalSubset = SkIRect::MakeSize(proxy->isize());
     }
 
+    GrColorType ct = SkColorTypeToGrColorType(this->imageInfo().colorType());
+
     return SkSpecialImage::MakeDeferredFromGpu(fContext.get(),
                                                finalSubset,
                                                kNeedNewImageUniqueID_SpecialImage,
                                                std::move(proxy),
+                                               ct,
                                                this->imageInfo().refColorSpace(),
                                                &this->surfaceProps());
 }

src/gpu/effects/GrRRectBlurEffect.fp

diff --git a/src/gpu/effects/GrRRectBlurEffect.fp b/src/gpu/effects/GrRRectBlurEffect.fp
index 6a39777..74ad750 100644
--- a/src/gpu/effects/GrRRectBlurEffect.fp
+++ b/src/gpu/effects/GrRRectBlurEffect.fp
@@ -76,6 +76,8 @@
             auto rtc2 =
                       SkGpuBlurUtils::GaussianBlur(context,
                                                    std::move(srcProxy),
+                                                   GrColorType::kAlpha_8,
+                                                   kPremul_SkAlphaType,
                                                    SkIPoint::Make(0, 0),
                                                    nullptr,
                                                    SkIRect::MakeWH(size.fWidth, size.fHeight),
@@ -83,7 +85,6 @@
                                                    xformedSigma,
                                                    xformedSigma,
                                                    GrTextureDomain::kIgnore_Mode,
-                                                   kPremul_SkAlphaType,
                                                    SkBackingFit::kExact);
             if (!rtc2) {
                 return nullptr;

src/gpu/effects/generated/GrRRectBlurEffect.h

diff --git a/src/gpu/effects/generated/GrRRectBlurEffect.h b/src/gpu/effects/generated/GrRRectBlurEffect.h
index aaff4d3..8b48489 100644
--- a/src/gpu/effects/generated/GrRRectBlurEffect.h
+++ b/src/gpu/effects/generated/GrRRectBlurEffect.h
@@ -75,6 +75,8 @@
             }
             auto rtc2 = SkGpuBlurUtils::GaussianBlur(context,
                                                      std::move(srcProxy),
+                                                     GrColorType::kAlpha_8,
+                                                     kPremul_SkAlphaType,
                                                      SkIPoint::Make(0, 0),
                                                      nullptr,
                                                      SkIRect::MakeWH(size.fWidth, size.fHeight),
@@ -82,7 +84,6 @@
                                                      xformedSigma,
                                                      xformedSigma,
                                                      GrTextureDomain::kIgnore_Mode,
-                                                     kPremul_SkAlphaType,
                                                      SkBackingFit::kExact);
             if (!rtc2) {
                 return nullptr;