make GR_TEST_UTILS=0 work
Change-Id: Icce35140ca08b65217b32e6b1ffc6ad2f38ab37f
Reviewed-on: https://skia-review.googlesource.com/7840
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index f39902f..767b7a0 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -654,6 +654,7 @@
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(QuadEdgeEffect);
+#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> QuadEdgeEffect::TestCreate(GrProcessorTestData* d) {
// Doesn't work without derivative instructions.
return d->fContext->caps()->shaderCaps()->shaderDerivativeSupport()
@@ -662,6 +663,7 @@
d->fRandom->nextBool())
: nullptr;
}
+#endif
///////////////////////////////////////////////////////////////////////////////
@@ -985,7 +987,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(AAConvexPathOp) {
GrColor color = GrRandomColor(random);
diff --git a/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp b/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
index 891eab3..f817f86 100644
--- a/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
@@ -551,7 +551,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
struct PathTestStruct {
typedef GrAADistanceFieldPathRenderer::ShapeCache ShapeCache;
diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp
index a0fc9f0..13aaae4 100644
--- a/src/gpu/ops/GrAAFillRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRectOp.cpp
@@ -383,7 +383,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
#include "GrDrawOpTest.h"
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 958eb57..f17b218 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -962,7 +962,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(AAHairlineOp) {
GrColor color = GrRandomColor(random);
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index fd09d91..fdb5d7f 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -350,7 +350,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(AAFlatteningConvexPathOp) {
GrColor color = GrRandomColor(random);
diff --git a/src/gpu/ops/GrAAStrokeRectOp.cpp b/src/gpu/ops/GrAAStrokeRectOp.cpp
index b05e722..c30be77 100644
--- a/src/gpu/ops/GrAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrAAStrokeRectOp.cpp
@@ -11,6 +11,7 @@
#include "GrOpFlushState.h"
#include "GrResourceKey.h"
#include "GrResourceProvider.h"
+#include "SkStrokeRec.h"
GR_DECLARE_STATIC_UNIQUE_KEY(gMiterIndexBufferKey);
GR_DECLARE_STATIC_UNIQUE_KEY(gBevelIndexBufferKey);
@@ -578,7 +579,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
#include "GrDrawOpTest.h"
diff --git a/src/gpu/ops/GrAnalyticRectOp.cpp b/src/gpu/ops/GrAnalyticRectOp.cpp
index 52934ff..df62e05 100644
--- a/src/gpu/ops/GrAnalyticRectOp.cpp
+++ b/src/gpu/ops/GrAnalyticRectOp.cpp
@@ -223,9 +223,11 @@
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(RectGeometryProcessor);
+#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> RectGeometryProcessor::TestCreate(GrProcessorTestData* d) {
return sk_sp<GrGeometryProcessor>(new RectGeometryProcessor(GrTest::TestMatrix(d->fRandom)));
}
+#endif
///////////////////////////////////////////////////////////////////////////////
@@ -385,7 +387,7 @@
new AnalyticRectOp(color, viewMatrix, rect, croppedRect, bounds));
}
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(AnalyticRectOp) {
SkMatrix viewMatrix = GrTest::TestMatrix(random);
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index d4be853..7d7dbf1 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -936,12 +936,14 @@
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingCircleEffect);
+#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> DashingCircleEffect::TestCreate(GrProcessorTestData* d) {
AAMode aaMode = static_cast<AAMode>(d->fRandom->nextULessThan(GrDashOp::kAAModeCnt));
return DashingCircleEffect::Make(GrRandomColor(d->fRandom),
aaMode, GrTest::TestMatrix(d->fRandom),
d->fRandom->nextBool());
}
+#endif
//////////////////////////////////////////////////////////////////////////////
@@ -1156,12 +1158,14 @@
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingLineEffect);
+#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> DashingLineEffect::TestCreate(GrProcessorTestData* d) {
AAMode aaMode = static_cast<AAMode>(d->fRandom->nextULessThan(GrDashOp::kAAModeCnt));
return DashingLineEffect::Make(GrRandomColor(d->fRandom),
aaMode, GrTest::TestMatrix(d->fRandom),
d->fRandom->nextBool());
}
+#endif
//////////////////////////////////////////////////////////////////////////////
@@ -1187,7 +1191,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(DashOp) {
GrColor color = GrRandomColor(random);
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index e76ded3..5ac71d8 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -607,7 +607,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(DefaultPathOp) {
GrColor color = GrRandomColor(random);
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index 4d78a7d..7ef7e06 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -179,7 +179,7 @@
return true;
}
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
static SkRSXform random_xform(SkRandom* random) {
static const SkScalar kMinExtent = -100.f;
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 3448249..2b63804 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -221,7 +221,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
#include "GrDrawOpTest.h"
diff --git a/src/gpu/ops/GrNonAAFillRectOp.cpp b/src/gpu/ops/GrNonAAFillRectOp.cpp
index 7ef6cad..5688c9b 100644
--- a/src/gpu/ops/GrNonAAFillRectOp.cpp
+++ b/src/gpu/ops/GrNonAAFillRectOp.cpp
@@ -188,7 +188,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
#include "GrDrawOpTest.h"
diff --git a/src/gpu/ops/GrNonAAFillRectPerspectiveOp.cpp b/src/gpu/ops/GrNonAAFillRectPerspectiveOp.cpp
index cec1cfc..cf657f0 100644
--- a/src/gpu/ops/GrNonAAFillRectPerspectiveOp.cpp
+++ b/src/gpu/ops/GrNonAAFillRectPerspectiveOp.cpp
@@ -232,7 +232,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
#include "GrDrawOpTest.h"
diff --git a/src/gpu/ops/GrNonAAStrokeRectOp.cpp b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
index 417d76e..53b359e 100644
--- a/src/gpu/ops/GrNonAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
@@ -12,6 +12,7 @@
#include "GrDrawOpTest.h"
#include "GrMeshDrawOp.h"
#include "GrOpFlushState.h"
+#include "SkStrokeRec.h"
#include "SkRandom.h"
/* create a triangle strip that strokes the specified rect. There are 8
@@ -193,7 +194,7 @@
}
}
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(NonAAStrokeRectOp) {
SkMatrix viewMatrix = GrTest::TestMatrix(random);
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index f693169..2f50bb4 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -246,11 +246,13 @@
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(CircleGeometryProcessor);
+#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> CircleGeometryProcessor::TestCreate(GrProcessorTestData* d) {
return sk_sp<GrGeometryProcessor>(new CircleGeometryProcessor(
d->fRandom->nextBool(), d->fRandom->nextBool(), d->fRandom->nextBool(),
d->fRandom->nextBool(), GrTest::TestMatrix(d->fRandom)));
}
+#endif
///////////////////////////////////////////////////////////////////////////////
@@ -382,10 +384,12 @@
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(EllipseGeometryProcessor);
+#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> EllipseGeometryProcessor::TestCreate(GrProcessorTestData* d) {
return sk_sp<GrGeometryProcessor>(
new EllipseGeometryProcessor(d->fRandom->nextBool(), GrTest::TestMatrix(d->fRandom)));
}
+#endif
///////////////////////////////////////////////////////////////////////////////
@@ -548,10 +552,12 @@
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DIEllipseGeometryProcessor);
+#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> DIEllipseGeometryProcessor::TestCreate(GrProcessorTestData* d) {
return sk_sp<GrGeometryProcessor>(new DIEllipseGeometryProcessor(
GrTest::TestMatrix(d->fRandom), (DIEllipseStyle)(d->fRandom->nextRangeU(0, 2))));
}
+#endif
///////////////////////////////////////////////////////////////////////////////
@@ -2402,7 +2408,7 @@
///////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(CircleOp) {
do {
diff --git a/src/gpu/ops/GrPLSPathRenderer.cpp b/src/gpu/ops/GrPLSPathRenderer.cpp
index 384733f..80a4cda 100644
--- a/src/gpu/ops/GrPLSPathRenderer.cpp
+++ b/src/gpu/ops/GrPLSPathRenderer.cpp
@@ -934,7 +934,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(PLSPathOp) {
GrColor color = GrRandomColor(random);
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index 1882aad..e0eadd8 100755
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -923,7 +923,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(ShadowCircleOp) {
do {
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index 509ac9f..dd0d3a0 100644
--- a/src/gpu/ops/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -367,7 +367,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef GR_TEST_UTILS
+#if GR_TEST_UTILS
DRAW_OP_TEST_DEFINE(TesselatingPathOp) {
GrColor color = GrRandomColor(random);