commit 3674f589ee89a401a8a2d19c70a22ce3c03c2f4b
author Robert Phillips <robertphillips@google.com> Wed Jun 16 12:05:54 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 16 17:09:37 2021 +0000
tree 769db84086a802dde9c43f052683aebbf1f2fca0
parent 9a1d38c455535a2813c98e3dae334363f60839d8

Make GrPathRenderer and all derived class be OGA-only

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

src/gpu/GrSurfaceDrawContext.cpp

diff --git a/src/gpu/GrSurfaceDrawContext.cpp b/src/gpu/GrSurfaceDrawContext.cpp
index 5a58dac..de18ac6 100644
--- a/src/gpu/GrSurfaceDrawContext.cpp
+++ b/src/gpu/GrSurfaceDrawContext.cpp
@@ -40,7 +40,6 @@
 #include "src/gpu/GrImageContextPriv.h"
 #include "src/gpu/GrImageInfo.h"
 #include "src/gpu/GrMemoryPool.h"
-#include "src/gpu/GrPathRenderer.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrResourceProvider.h"
@@ -73,6 +72,10 @@
 #include "src/gpu/text/GrSDFTControl.h"
 #include "src/gpu/text/GrTextBlobCache.h"
 
+#if GR_OGA
+#include "src/gpu/GrPathRenderer.h"
+#endif
+
 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this->drawingManager()->getContext())
 #define ASSERT_SINGLE_OWNER        GR_ASSERT_SINGLE_OWNER(this->singleOwner())
 #define RETURN_IF_ABANDONED        if (fContext->abandoned()) { return; }
@@ -874,6 +877,7 @@
                                        GrAA doStencilMSAA,
                                        const SkMatrix& viewMatrix,
                                        const SkPath& path) {
+#if GR_OGA
     SkIRect clipBounds = clip ? clip->getConservativeBounds()
                               : SkIRect::MakeSize(this->dimensions());
     GrStyledShape shape(path, GrStyledShape::DoSimplify::kNo);
@@ -905,6 +909,9 @@
     args.fDoStencilMSAA = doStencilMSAA;
     pr->stencilPath(args);
     return true;
+#else
+    return false;
+#endif // GR_OGA
 }
 
 void GrSurfaceDrawContext::drawTextureSet(const GrClip* clip,
@@ -1532,9 +1539,11 @@
                                      /* attemptDrawSimple */ true);
 }
 
+#if GR_OGA
 static SkIRect get_clip_bounds(const GrSurfaceDrawContext* rtc, const GrClip* clip) {
     return clip ? clip->getConservativeBounds() : SkIRect::MakeWH(rtc->width(), rtc->height());
 }
+#endif // GR_OGA
 
 bool GrSurfaceDrawContext::drawAndStencilPath(const GrHardClip* clip,
                                               const GrUserStencilSettings* ss,
@@ -1543,6 +1552,7 @@
                                               GrAA aa,
                                               const SkMatrix& viewMatrix,
                                               const SkPath& path) {
+#if GR_OGA
     ASSERT_SINGLE_OWNER
     RETURN_FALSE_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
@@ -1601,6 +1611,9 @@
                                       this->colorInfo().isLinearlyBlended()};
     pr->drawPath(args);
     return true;
+#else
+    return false;
+#endif
 }
 
 SkBudgeted GrSurfaceDrawContext::isBudgeted() const {
@@ -1722,6 +1735,7 @@
                                                       const SkMatrix& viewMatrix,
                                                       GrStyledShape&& shape,
                                                       bool attemptDrawSimple) {
+#if GR_OGA
     ASSERT_SINGLE_OWNER
     RETURN_IF_ABANDONED
     GR_CREATE_TRACE_MARKER_CONTEXT("GrSurfaceDrawContext", "internalDrawPath", fContext);
@@ -1830,6 +1844,7 @@
                                       aaType,
                                       this->colorInfo().isLinearlyBlended()};
     pr->drawPath(args);
+#endif
 }
 
 static void op_bounds(SkRect* bounds, const GrOp* op) {