GR_TEST_UTILS fixes
Fixes build of Skia lib when GR_TEST_UTILS=0
Makes GR_TEST_UTILS=0 for official builds
Makes "Mini" builder bot exercise building GPU with is_official_build=true
Bug: skia:6786
Change-Id: I6186683a3a216d2e779645bd9e8276a66bcff4d5
Reviewed-on: https://skia-review.googlesource.com/21524
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
index 3a97506..b10b970 100644
--- a/src/gpu/effects/GrBezierEffect.h
+++ b/src/gpu/effects/GrBezierEffect.h
@@ -121,7 +121,7 @@
const Attribute* fInPosition;
const Attribute* fInConicCoeffs;
- GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST
typedef GrGeometryProcessor INHERITED;
};
@@ -203,7 +203,7 @@
const Attribute* fInPosition;
const Attribute* fInHairQuadEdge;
- GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST
typedef GrGeometryProcessor INHERITED;
};
@@ -281,7 +281,7 @@
GrPrimitiveEdgeType fEdgeType;
const Attribute* fInPosition;
- GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST
typedef GrGeometryProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/effects/GrBicubicEffect.h
index de9468b..e96d290 100644
--- a/src/gpu/effects/GrBicubicEffect.h
+++ b/src/gpu/effects/GrBicubicEffect.h
@@ -74,7 +74,7 @@
GrTextureDomain fDomain;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrSingleTextureEffect INHERITED;
};
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
index c3ddadc..2664b2e 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.h
+++ b/src/gpu/effects/GrBitmapTextGeoProc.h
@@ -61,7 +61,7 @@
const Attribute* fInTextureCoords;
GrMaskFormat fMaskFormat;
- GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST
typedef GrGeometryProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h b/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h
index cfcc17a..85504fd 100644
--- a/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h
+++ b/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h
@@ -55,7 +55,7 @@
bool onIsEqual(const GrFragmentProcessor&) const override;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
Mode fMode;
diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h
index 4b0c02d..f6bb7b1 100644
--- a/src/gpu/effects/GrConfigConversionEffect.h
+++ b/src/gpu/effects/GrConfigConversionEffect.h
@@ -53,7 +53,7 @@
PMConversion fPMConversion;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrConstColorProcessor.h b/src/gpu/effects/GrConstColorProcessor.h
index b543aa5..1669f2b 100644
--- a/src/gpu/effects/GrConstColorProcessor.h
+++ b/src/gpu/effects/GrConstColorProcessor.h
@@ -67,7 +67,7 @@
GrColor4f constantOutputForConstantInput(GrColor4f input) const override;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
GrColor4f fColor;
InputMode fMode;
diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
index 4b9599e..fd01798 100644
--- a/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -49,7 +49,7 @@
typedef GrFragmentProcessor INHERITED;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
};
diff --git a/src/gpu/effects/GrConvexPolyEffect.h b/src/gpu/effects/GrConvexPolyEffect.h
index 34f8b22..fa26fb4 100644
--- a/src/gpu/effects/GrConvexPolyEffect.h
+++ b/src/gpu/effects/GrConvexPolyEffect.h
@@ -80,7 +80,7 @@
int fEdgeCount;
SkScalar fEdges[3 * kMaxEdges];
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrCoverageSetOpXP.h b/src/gpu/effects/GrCoverageSetOpXP.h
index ba04a2e..062d9dd 100644
--- a/src/gpu/effects/GrCoverageSetOpXP.h
+++ b/src/gpu/effects/GrCoverageSetOpXP.h
@@ -42,7 +42,7 @@
}
- GR_DECLARE_XP_FACTORY_TEST;
+ GR_DECLARE_XP_FACTORY_TEST
SkRegion::Op fRegionOp;
bool fInvertCoverage;
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index 17e0ba1..9891ee6 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -221,7 +221,7 @@
const GrProcessorAnalysisCoverage&,
const GrCaps&) const override;
- GR_DECLARE_XP_FACTORY_TEST;
+ GR_DECLARE_XP_FACTORY_TEST
SkBlendMode fMode;
GrBlendEquation fHWBlendEquation;
diff --git a/src/gpu/effects/GrDisableColorXP.h b/src/gpu/effects/GrDisableColorXP.h
index 7470444..5b4ebcf 100644
--- a/src/gpu/effects/GrDisableColorXP.h
+++ b/src/gpu/effects/GrDisableColorXP.h
@@ -36,7 +36,7 @@
bool hasMixedSamples,
const GrCaps&) const override;
- GR_DECLARE_XP_FACTORY_TEST;
+ GR_DECLARE_XP_FACTORY_TEST
typedef GrXPFactory INHERITED;
};
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h
index c0cc2e9..3f616e9 100644
--- a/src/gpu/effects/GrDistanceFieldGeoProc.h
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.h
@@ -107,7 +107,7 @@
const Attribute* fInTextureCoords;
bool fUsesLocalCoords;
- GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST
typedef GrGeometryProcessor INHERITED;
};
@@ -160,7 +160,7 @@
const Attribute* fInTextureCoords;
bool fUsesLocalCoords;
- GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST
typedef GrGeometryProcessor INHERITED;
};
@@ -234,7 +234,7 @@
const Attribute* fInTextureCoords;
bool fUsesLocalCoords;
- GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST
typedef GrGeometryProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrDitherEffect.h b/src/gpu/effects/GrDitherEffect.h
index 32cb872..cbb6264 100644
--- a/src/gpu/effects/GrDitherEffect.h
+++ b/src/gpu/effects/GrDitherEffect.h
@@ -27,7 +27,7 @@
GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
void onGetGLSLProcessorKey(const GrShaderCaps&,GrProcessorKeyBuilder*) const override;
bool onIsEqual(const GrFragmentProcessor&) const override;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
#endif
diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
index 5f520df..7496c35 100644
--- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
+++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
@@ -61,7 +61,7 @@
bool onIsEqual(const GrFragmentProcessor&) const override;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
// TODO: Inline the kernel constants into the generated shader code. This may involve pulling
// some of the logic from SkGpuBlurUtils into this class related to radius/sigma calculations.
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h
index ffd05fa..57e0fd9 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.h
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.h
@@ -79,7 +79,7 @@
bool fConvolveAlpha;
GrTextureDomain fDomain;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrSingleTextureEffect INHERITED;
};
diff --git a/src/gpu/effects/GrNonlinearColorSpaceXformEffect.cpp b/src/gpu/effects/GrNonlinearColorSpaceXformEffect.cpp
index ab03268..bfa2ed7 100644
--- a/src/gpu/effects/GrNonlinearColorSpaceXformEffect.cpp
+++ b/src/gpu/effects/GrNonlinearColorSpaceXformEffect.cpp
@@ -6,13 +6,12 @@
*/
#include "GrNonlinearColorSpaceXformEffect.h"
-
+#include "GrColorSpaceXform.h"
#include "GrProcessor.h"
+#include "SkColorSpace_Base.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
-#include "SkColorSpace_Base.h"
-
class GrGLNonlinearColorSpaceXformEffect : public GrGLSLFragmentProcessor {
public:
void emitCode(EmitArgs& args) override {
diff --git a/src/gpu/effects/GrNonlinearColorSpaceXformEffect.h b/src/gpu/effects/GrNonlinearColorSpaceXformEffect.h
index 36f7783..02b57e4 100644
--- a/src/gpu/effects/GrNonlinearColorSpaceXformEffect.h
+++ b/src/gpu/effects/GrNonlinearColorSpaceXformEffect.h
@@ -64,7 +64,7 @@
SkMatrix44 fGamutXform;
uint32_t fOps;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp
index 2eb1d85..20e476d 100644
--- a/src/gpu/effects/GrOvalEffect.cpp
+++ b/src/gpu/effects/GrOvalEffect.cpp
@@ -45,7 +45,7 @@
SkScalar fRadius;
GrPrimitiveEdgeType fEdgeType;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
@@ -206,7 +206,7 @@
SkVector fRadii;
GrPrimitiveEdgeType fEdgeType;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.h b/src/gpu/effects/GrPorterDuffXferProcessor.h
index c5680ca..3599aef 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.h
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.h
@@ -51,7 +51,7 @@
const GrProcessorAnalysisCoverage&,
const GrCaps&) const override;
- GR_DECLARE_XP_FACTORY_TEST;
+ GR_DECLARE_XP_FACTORY_TEST
static void TestGetXPOutputTypes(const GrXferProcessor*, int* outPrimary, int* outSecondary);
SkBlendMode fBlendMode;
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
index 8d18150..56dc2ee 100644
--- a/src/gpu/effects/GrRRectEffect.cpp
+++ b/src/gpu/effects/GrRRectEffect.cpp
@@ -71,7 +71,7 @@
GrPrimitiveEdgeType fEdgeType;
uint32_t fCircularCornerFlags;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
@@ -406,7 +406,7 @@
SkRRect fRRect;
GrPrimitiveEdgeType fEdgeType;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrSRGBEffect.h b/src/gpu/effects/GrSRGBEffect.h
index 169b223..f91224e 100644
--- a/src/gpu/effects/GrSRGBEffect.h
+++ b/src/gpu/effects/GrSRGBEffect.h
@@ -39,7 +39,7 @@
Mode fMode;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrShadowGeoProc.h b/src/gpu/effects/GrShadowGeoProc.h
index b0631ef..d9a1eaf 100644
--- a/src/gpu/effects/GrShadowGeoProc.h
+++ b/src/gpu/effects/GrShadowGeoProc.h
@@ -46,7 +46,7 @@
const Attribute* fInColor;
const Attribute* fInShadowParams;
- GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST
typedef GrGeometryProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h
index 0bf2dcc..5013e3d 100644
--- a/src/gpu/effects/GrSimpleTextureEffect.h
+++ b/src/gpu/effects/GrSimpleTextureEffect.h
@@ -69,7 +69,7 @@
bool onIsEqual(const GrFragmentProcessor& other) const override { return true; }
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrSingleTextureEffect INHERITED;
};
diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h
index afd4d5f..5d25b91 100644
--- a/src/gpu/effects/GrTextureDomain.h
+++ b/src/gpu/effects/GrTextureDomain.h
@@ -189,7 +189,7 @@
bool onIsEqual(const GrFragmentProcessor&) const override;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrSingleTextureEffect INHERITED;
};
@@ -227,7 +227,7 @@
bool onIsEqual(const GrFragmentProcessor& fp) const override;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
index dde383e..94491c9 100644
--- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
+++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
@@ -160,7 +160,7 @@
SkBlendMode fMode;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};
@@ -420,7 +420,7 @@
SkBlendMode fMode;
Child fChild;
- GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST
typedef GrFragmentProcessor INHERITED;
};