commit 46eb3ab80de76a4a987dd7bb9c2fc628cb074eaa
author Robert Phillips <robertphillips@google.com> Mon Aug 02 17:09:01 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Aug 03 16:07:22 2021 +0000
tree 7925499826186613668af9109f69ac7fe9ba0d63
parent caa760e214c8bc85f7e496d11d18671e4fc77720

Make v1/SurfaceDrawContext V1-only

The GrFillRectOp and GrTextureOp guards are temporary - just until they are made V1-only.

The SkGlyphRunPainter and GrTextBlob guards are going to linger since both will probably exist in both versions.

The GrTextBlob guards mainly hide the draw and makeAtlasTextOp methods.

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

src/gpu/ops/GrTextureOp.h

diff --git a/src/gpu/ops/GrTextureOp.h b/src/gpu/ops/GrTextureOp.h
index 2361f2e..76c70d8 100644
--- a/src/gpu/ops/GrTextureOp.h
+++ b/src/gpu/ops/GrTextureOp.h
@@ -57,6 +57,7 @@
                             DrawQuad*,
                             const SkRect* subset = nullptr);
 
+#if SK_GPU_V1
     // Automatically falls back to using one GrFillRectOp per entry if dynamic states are not
     // supported, or if the blend mode is not src-over. 'cnt' is the size of the entry array.
     // 'proxyCnt' <= 'cnt' and represents the number of proxy switches within the array.
@@ -74,6 +75,7 @@
                                  SkCanvas::SrcRectConstraint,
                                  const SkMatrix& viewMatrix,
                                  sk_sp<GrColorSpaceXform> textureXform);
+#endif
 
 #if GR_TEST_UTILS
     static uint32_t ClassID();