commit 33bf2b56f9cfa73ec96a55f426c6ffc252fc923c
author Robert Phillips <robertphillips@google.com> Mon Aug 02 11:14:38 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Aug 02 16:04:52 2021 +0000
tree 8fb05981c1dd75c5e1d257142f7be5f29ddd257e
parent 295788554871145a64b2cc0bf925bec8b32b0fcc

Pipe all SDC creation through the recording context

In the new GrSurfaceContext class hierarchy we can get either a v1 or v2 SFC/SDC depending on the context options setting.

Bug: skia:11837
Change-Id: Ia25bc10b58bbbaf65a484b323d9d0eee471bb7ef
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/435276
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

gm/gpu_blur_utils.cpp

diff --git a/gm/gpu_blur_utils.cpp b/gm/gpu_blur_utils.cpp
index b504895..7706283 100644
--- a/gm/gpu_blur_utils.cpp
+++ b/gm/gpu_blur_utils.cpp
@@ -46,20 +46,20 @@
 
 // Performs tiling first of the src into dst bounds with a surrounding skirt so the blur can use
 // clamp. Does repeated blurs rather than invoking downsampling.
-static GrSurfaceProxyView slow_blur(GrRecordingContext* ctx,
+static GrSurfaceProxyView slow_blur(GrRecordingContext* rContext,
                                     GrSurfaceProxyView src,
                                     SkIRect dstB,
                                     SkIRect srcB,
                                     float sigmaX,
                                     float sigmaY,
                                     SkTileMode mode) {
-    auto tileInto = [ctx](GrSurfaceProxyView src,
-                          SkIRect srcTileRect,
-                          SkISize resultSize,
-                          SkIPoint offset,
-                          SkTileMode mode) {
+    auto tileInto = [rContext](GrSurfaceProxyView src,
+                               SkIRect srcTileRect,
+                               SkISize resultSize,
+                               SkIPoint offset,
+                               SkTileMode mode) {
         GrImageInfo info(GrColorType::kRGBA_8888, kPremul_SkAlphaType, nullptr, resultSize);
-        auto sfc = GrSurfaceFillContext::Make(ctx, info);
+        auto sfc = rContext->priv().makeSFC(info);
         if (!sfc) {
             return GrSurfaceProxyView{};
         }
@@ -69,7 +69,7 @@
                                               SkMatrix::Translate(-offset.x(), -offset.y()),
                                               sampler,
                                               SkRect::Make(srcTileRect),
-                                              *ctx->priv().caps());
+                                              *rContext->priv().caps());
         sfc->fillWithFP(std::move(fp));
         return sfc->readSurfaceView();
     };
@@ -100,7 +100,7 @@
             sigmaY = 0.f;
         }
         auto bounds = SkIRect::MakeSize(src.dimensions());
-        auto sdc = SkGpuBlurUtils::GaussianBlur(ctx,
+        auto sdc = SkGpuBlurUtils::GaussianBlur(rContext,
                                                 std::move(src),
                                                 GrColorType::kRGBA_8888,
                                                 kPremul_SkAlphaType,