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>
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index d705e24..f027a0d 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -42,7 +42,9 @@
#include "src/gpu/ops/GrQuadPerEdgeAA.h"
#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"
#include "src/gpu/ops/GrTextureOp.h"
+#if SK_GPU_V1
#include "src/gpu/v1/SurfaceDrawContext_v1.h"
+#endif
namespace {
@@ -177,6 +179,8 @@
ys.store(srcQuad->ys());
}
+#if SK_GPU_V1
+
// Count the number of proxy runs in the entry set. This usually is already computed by
// SkGpuDevice, but when the BatchLengthLimiter chops the set up it must determine a new proxy count
// for each split.
@@ -191,6 +195,7 @@
}
return actualProxyRunCount;
}
+#endif
static bool safe_to_ignore_subset_rect(GrAAType aaType, GrSamplerState::Filter filter,
const DrawQuad& quad, const SkRect& subsetRect) {
@@ -1181,6 +1186,8 @@
}
}
+#if SK_GPU_V1
+
// A helper class that assists in breaking up bulk API quad draws into manageable chunks.
class GrTextureOp::BatchSizeLimiter {
public:
@@ -1371,6 +1378,7 @@
}
}
}
+#endif
#if GR_TEST_UTILS
#include "include/gpu/GrRecordingContext.h"