diff options
59 files changed, 118 insertions, 108 deletions
@@ -184,6 +184,9 @@ config("skia_private") { if (skia_enable_discrete_gpu) { defines += [ "SK_ENABLE_DISCRETE_GPU" ] } + if (!is_official_build) { + defines += [ "GR_TEST_UTILS=1" ] + } } # Any code that's linked into Skia-the-library should use this config via += skia_library_configs. diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index 9628775f35..8dcc18c04e 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -341,7 +341,7 @@ ////////////////////////////////////////////////////////////////////// #ifndef GR_TEST_UTILS -# define GR_TEST_UTILS 1 +# define GR_TEST_UTILS 0 #endif ////////////////////////////////////////////////////////////////////// diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index 065b5f9b7b..b9e645db82 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -20,7 +20,7 @@ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini/Release", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_component_build=true is_debug=false is_official_build=true skia_enable_effects=false skia_enable_gpu=false skia_enable_pdf=false skia_use_expat=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_zlib=false target_cpu=\"x86_64\"" + "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_component_build=true is_debug=false is_official_build=true skia_enable_effects=false skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_zlib=false target_cpu=\"x86_64\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 9e8a488297..f02f2be962 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -87,7 +87,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): 'is_component_build': 'true', # Proves we can link a coherent .so. 'is_official_build': 'true', # No debug symbols, no tools. 'skia_enable_effects': 'false', - 'skia_enable_gpu': 'false', + 'skia_enable_gpu': 'true', 'skia_enable_pdf': 'false', 'skia_use_expat': 'false', 'skia_use_libjpeg_turbo': 'false', diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index a13069aced..9e8cb3f412 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -113,7 +113,7 @@ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini/Release", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_component_build=true is_debug=false is_official_build=true skia_enable_effects=false skia_enable_gpu=false skia_enable_pdf=false skia_use_expat=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_zlib=false target_cpu=\"x86_64\"" + "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_component_build=true is_debug=false is_official_build=true skia_enable_effects=false skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_zlib=false target_cpu=\"x86_64\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp index f08a7f5698..7cf508b67b 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.cpp +++ b/src/core/SkColorMatrixFilterRowMajor255.cpp @@ -189,7 +189,7 @@ public: const char* name() const override { return "Color Matrix"; } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST class GLSLProcessor : public GrGLSLFragmentProcessor { public: diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.fp b/src/effects/GrAlphaThresholdFragmentProcessor.fp index a7010a712a..1cc38c6d76 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.fp +++ b/src/effects/GrAlphaThresholdFragmentProcessor.fp @@ -47,6 +47,7 @@ in uniform float outerThreshold; @header { #include "SkTypes.h" #if SK_SUPPORT_GPU + #include "GrColorSpaceXform.h" } @headerEnd { diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.h b/src/effects/GrAlphaThresholdFragmentProcessor.h index 454085730b..80e4e0b718 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.h +++ b/src/effects/GrAlphaThresholdFragmentProcessor.h @@ -13,6 +13,7 @@ #include "SkTypes.h" #if SK_SUPPORT_GPU + #include "GrColorSpaceXform.h" #include "GrFragmentProcessor.h" #include "GrCoordTransform.h" #include "effects/GrProxyMove.h" @@ -63,7 +64,7 @@ private: 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 GrCoordTransform fImageCoordTransform; GrCoordTransform fMaskCoordTransform; diff --git a/src/effects/GrCircleBlurFragmentProcessor.h b/src/effects/GrCircleBlurFragmentProcessor.h index e8f9723380..3ed4cfc094 100644 --- a/src/effects/GrCircleBlurFragmentProcessor.h +++ b/src/effects/GrCircleBlurFragmentProcessor.h @@ -64,7 +64,7 @@ private: float fTextureRadius; TextureSampler fBlurProfileSampler; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; diff --git a/src/effects/SkArithmeticImageFilter.cpp b/src/effects/SkArithmeticImageFilter.cpp index e6ae335623..86e66ef08a 100644 --- a/src/effects/SkArithmeticImageFilter.cpp +++ b/src/effects/SkArithmeticImageFilter.cpp @@ -302,7 +302,7 @@ private: float fK1, fK2, fK3, fK4; bool fEnforcePMColor; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; } diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index be11cf4443..d85160e651 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -828,7 +828,7 @@ private: TextureSampler fBlurProfileSampler; GrSLPrecision fPrecision; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; @@ -1094,7 +1094,7 @@ private: float fSigma; TextureSampler fNinePatchSampler; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 900efcb958..dc85088f5f 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -204,7 +204,7 @@ private: sk_sp<GrTextureProxy> color, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkISize& colorDimensions); - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST GrCoordTransform fDisplacementTransform; TextureSampler fDisplacementSampler; diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 0e8612480b..be872864ac 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -653,7 +653,7 @@ private: BoundaryMode boundaryMode, const SkIRect* srcBounds); - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST SkScalar fKD; typedef GrLightingEffect INHERITED; @@ -696,7 +696,7 @@ private: BoundaryMode boundaryMode, const SkIRect* srcBounds); - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST SkScalar fKS; SkScalar fShininess; @@ -1527,31 +1527,6 @@ sk_sp<GrFragmentProcessor> SkSpecularLightingImageFilter::makeFragmentProcessor( #if SK_SUPPORT_GPU -static SkPoint3 random_point3(SkRandom* random) { - return SkPoint3::Make(SkScalarToFloat(random->nextSScalar1()), - SkScalarToFloat(random->nextSScalar1()), - SkScalarToFloat(random->nextSScalar1())); -} - -static SkImageFilterLight* create_random_light(SkRandom* random) { - int type = random->nextULessThan(3); - switch (type) { - case 0: { - return new SkDistantLight(random_point3(random), random->nextU()); - } - case 1: { - return new SkPointLight(random_point3(random), random->nextU()); - } - case 2: { - return new SkSpotLight(random_point3(random), random_point3(random), - random->nextUScalar1(), random->nextUScalar1(), random->nextU()); - } - default: - SkFAIL("Unexpected value."); - return nullptr; - } -} - static SkString emitNormalFunc(BoundaryMode mode, const char* pointToNormalName, const char* sobelFuncName) { @@ -1755,6 +1730,32 @@ GrGLSLFragmentProcessor* GrDiffuseLightingEffect::onCreateGLSLInstance() const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDiffuseLightingEffect); #if GR_TEST_UTILS + +static SkPoint3 random_point3(SkRandom* random) { + return SkPoint3::Make(SkScalarToFloat(random->nextSScalar1()), + SkScalarToFloat(random->nextSScalar1()), + SkScalarToFloat(random->nextSScalar1())); +} + +static SkImageFilterLight* create_random_light(SkRandom* random) { + int type = random->nextULessThan(3); + switch (type) { + case 0: { + return new SkDistantLight(random_point3(random), random->nextU()); + } + case 1: { + return new SkPointLight(random_point3(random), random->nextU()); + } + case 2: { + return new SkSpotLight(random_point3(random), random_point3(random), + random->nextUScalar1(), random->nextUScalar1(), random->nextU()); + } + default: + SkFAIL("Unexpected value."); + return nullptr; + } +} + sk_sp<GrFragmentProcessor> GrDiffuseLightingEffect::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 5e4b466d96..76e9b3e8af 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -107,7 +107,7 @@ private: bool onIsEqual(const GrFragmentProcessor&) const override; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST SkIRect fBounds; SkRect fSrcRect; diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 0de1735651..fd928de217 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -183,7 +183,7 @@ private: GrMorphologyEffect(sk_sp<GrTextureProxy>, Direction, int radius, MorphologyType, const float bounds[2]); - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef Gr1DKernelEffect INHERITED; }; diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index da0071d84a..2e8e57ec3e 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -344,7 +344,7 @@ private: ColorTableEffect(sk_sp<GrTextureProxy> proxy, GrTextureStripAtlas* atlas, int row, unsigned flags); - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST TextureSampler fTextureSampler; GrTextureStripAtlas* fAtlas; diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp index fd1f72a1d9..ec79053788 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/GrDefaultGeoProcFactory.cpp @@ -284,7 +284,7 @@ private: bool fLocalCoordsWillBeRead; sk_sp<GrColorSpaceXform> fColorSpaceXform; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; diff --git a/src/gpu/GrDefaultGeoProcFactory.h b/src/gpu/GrDefaultGeoProcFactory.h index 6a3c0b75b8..66f27589dd 100644 --- a/src/gpu/GrDefaultGeoProcFactory.h +++ b/src/gpu/GrDefaultGeoProcFactory.h @@ -8,6 +8,7 @@ #ifndef GrDefaultGeoProcFactory_DEFINED #define GrDefaultGeoProcFactory_DEFINED +#include "GrColorSpaceXform.h" #include "GrGeometryProcessor.h" /* diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h index 771b276570..a2be518de6 100644 --- a/src/gpu/GrProcessor.h +++ b/src/gpu/GrProcessor.h @@ -8,23 +8,23 @@ #ifndef GrProcessor_DEFINED #define GrProcessor_DEFINED -#include "GrColor.h" +#include "../private/SkAtomics.h" #include "GrBuffer.h" +#include "GrColor.h" #include "GrGpuResourceRef.h" #include "GrProcessorUnitTest.h" #include "GrProgramElement.h" #include "GrSamplerParams.h" #include "GrShaderVar.h" #include "GrSurfaceProxyPriv.h" +#include "GrTextureProxy.h" #include "SkMath.h" #include "SkString.h" -#include "../private/SkAtomics.h" class GrContext; class GrCoordTransform; class GrInvariantOutput; class GrResourceProvider; -class GrTextureProxy; /** * Used by processors to build their keys. It incorporates each per-processor key into a larger diff --git a/src/gpu/GrProcessorUnitTest.h b/src/gpu/GrProcessorUnitTest.h index a3688233d2..5a5f5d3c0f 100644 --- a/src/gpu/GrProcessorUnitTest.h +++ b/src/gpu/GrProcessorUnitTest.h @@ -141,15 +141,15 @@ private: */ #define GR_DECLARE_GEOMETRY_PROCESSOR_TEST \ static GrProcessorTestFactory<GrGeometryProcessor> gTestFactory SK_UNUSED; \ - static sk_sp<GrGeometryProcessor> TestCreate(GrProcessorTestData*) + static sk_sp<GrGeometryProcessor> TestCreate(GrProcessorTestData*); #define GR_DECLARE_FRAGMENT_PROCESSOR_TEST \ static GrProcessorTestFactory<GrFragmentProcessor> gTestFactory SK_UNUSED; \ - static sk_sp<GrFragmentProcessor> TestCreate(GrProcessorTestData*) + static sk_sp<GrFragmentProcessor> TestCreate(GrProcessorTestData*); #define GR_DECLARE_XP_FACTORY_TEST \ static GrXPFactoryTestFactory gTestFactory SK_UNUSED; \ - static const GrXPFactory* TestGet(GrProcessorTestData*) + static const GrXPFactory* TestGet(GrProcessorTestData*); /** GrProcessor subclasses should insert this macro in their implementation file. They must then * also implement this static function: @@ -169,19 +169,19 @@ private: // The unit test relies on static initializers. Just declare the TestCreate function so that // its definitions will compile. #define GR_DECLARE_FRAGMENT_PROCESSOR_TEST \ - static sk_sp<GrFragmentProcessor> TestCreate(GrProcessorTestData*) + static sk_sp<GrFragmentProcessor> TestCreate(GrProcessorTestData*); #define GR_DEFINE_FRAGMENT_PROCESSOR_TEST(X) // The unit test relies on static initializers. Just declare the TestCreate function so that // its definitions will compile. #define GR_DECLARE_GEOMETRY_PROCESSOR_TEST \ - static sk_sp<GrGeometryProcessor> TestCreate(GrProcessorTestData*) + static sk_sp<GrGeometryProcessor> TestCreate(GrProcessorTestData*); #define GR_DEFINE_GEOMETRY_PROCESSOR_TEST(X) // The unit test relies on static initializers. Just declare the TestGet function so that // its definitions will compile. #define GR_DECLARE_XP_FACTORY_TEST \ - const GrXPFactory* TestGet(GrProcessorTestData*) + const GrXPFactory* TestGet(GrProcessorTestData*); #define GR_DEFINE_XP_FACTORY_TEST(X) #endif // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h index 3a97506396..b10b970577 100644 --- a/src/gpu/effects/GrBezierEffect.h +++ b/src/gpu/effects/GrBezierEffect.h @@ -121,7 +121,7 @@ private: const Attribute* fInPosition; const Attribute* fInConicCoeffs; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; @@ -203,7 +203,7 @@ private: const Attribute* fInPosition; const Attribute* fInHairQuadEdge; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; @@ -281,7 +281,7 @@ private: 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 de9468b1b2..e96d290629 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/effects/GrBicubicEffect.h @@ -74,7 +74,7 @@ private: 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 c3ddadcc8e..2664b2e00c 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/effects/GrBitmapTextGeoProc.h @@ -61,7 +61,7 @@ private: 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 cfcc17adaf..85504fdc2b 100644 --- a/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h +++ b/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h @@ -55,7 +55,7 @@ private: 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 4b0c02dc96..f6bb7b1034 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -53,7 +53,7 @@ private: 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 b543aa5069..1669f2b71e 100644 --- a/src/gpu/effects/GrConstColorProcessor.h +++ b/src/gpu/effects/GrConstColorProcessor.h @@ -67,7 +67,7 @@ private: 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 4b9599ef32..fd01798d70 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -49,7 +49,7 @@ private: 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 34f8b22cff..fa26fb4b72 100644 --- a/src/gpu/effects/GrConvexPolyEffect.h +++ b/src/gpu/effects/GrConvexPolyEffect.h @@ -80,7 +80,7 @@ private: 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 ba04a2eb4c..062d9dddd1 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.h +++ b/src/gpu/effects/GrCoverageSetOpXP.h @@ -42,7 +42,7 @@ private: } - 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 17e0ba13f0..9891ee69c0 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -221,7 +221,7 @@ private: 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 7470444a21..5b4ebcf929 100644 --- a/src/gpu/effects/GrDisableColorXP.h +++ b/src/gpu/effects/GrDisableColorXP.h @@ -36,7 +36,7 @@ private: 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 c0cc2e9e13..3f616e9480 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.h +++ b/src/gpu/effects/GrDistanceFieldGeoProc.h @@ -107,7 +107,7 @@ private: const Attribute* fInTextureCoords; bool fUsesLocalCoords; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; @@ -160,7 +160,7 @@ private: const Attribute* fInTextureCoords; bool fUsesLocalCoords; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; @@ -234,7 +234,7 @@ private: 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 32cb87259d..cbb626424c 100644 --- a/src/gpu/effects/GrDitherEffect.h +++ b/src/gpu/effects/GrDitherEffect.h @@ -27,7 +27,7 @@ private: 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 5f520df23b..7496c35d44 100644 --- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h +++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h @@ -61,7 +61,7 @@ private: 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 ffd05fa06f..57e0fd9a72 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/effects/GrMatrixConvolutionEffect.h @@ -79,7 +79,7 @@ private: 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 ab03268f62..bfa2ed77df 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 36f778398e..02b57e475c 100644 --- a/src/gpu/effects/GrNonlinearColorSpaceXformEffect.h +++ b/src/gpu/effects/GrNonlinearColorSpaceXformEffect.h @@ -64,7 +64,7 @@ private: 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 2eb1d85b1e..20e476d255 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -45,7 +45,7 @@ private: SkScalar fRadius; GrPrimitiveEdgeType fEdgeType; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; @@ -206,7 +206,7 @@ private: 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 c5680ca294..3599aeff0b 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.h +++ b/src/gpu/effects/GrPorterDuffXferProcessor.h @@ -51,7 +51,7 @@ private: 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 8d18150a46..56dc2eec43 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -71,7 +71,7 @@ private: GrPrimitiveEdgeType fEdgeType; uint32_t fCircularCornerFlags; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; @@ -406,7 +406,7 @@ private: 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 169b223221..f91224e56d 100644 --- a/src/gpu/effects/GrSRGBEffect.h +++ b/src/gpu/effects/GrSRGBEffect.h @@ -39,7 +39,7 @@ private: 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 b0631efd9e..d9a1eaf981 100644 --- a/src/gpu/effects/GrShadowGeoProc.h +++ b/src/gpu/effects/GrShadowGeoProc.h @@ -46,7 +46,7 @@ private: 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 0bf2dcce68..5013e3dce8 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -69,7 +69,7 @@ private: 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 afd4d5f1a0..5d25b91042 100644 --- a/src/gpu/effects/GrTextureDomain.h +++ b/src/gpu/effects/GrTextureDomain.h @@ -189,7 +189,7 @@ private: bool onIsEqual(const GrFragmentProcessor&) const override; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrSingleTextureEffect INHERITED; }; @@ -227,7 +227,7 @@ private: 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 dde383ed45..94491c976e 100644 --- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp +++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp @@ -160,7 +160,7 @@ private: SkBlendMode fMode; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; @@ -420,7 +420,7 @@ private: SkBlendMode fMode; Child fChild; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp index 261f0c40b0..af10450ecc 100644 --- a/src/gpu/ops/GrAAConvexPathRenderer.cpp +++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp @@ -648,7 +648,7 @@ private: SkMatrix fLocalMatrix; bool fUsesLocalCoords; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; diff --git a/src/gpu/ops/GrAnalyticRectOp.cpp b/src/gpu/ops/GrAnalyticRectOp.cpp index 90726c668c..b2e69b3541 100644 --- a/src/gpu/ops/GrAnalyticRectOp.cpp +++ b/src/gpu/ops/GrAnalyticRectOp.cpp @@ -183,7 +183,7 @@ private: const Attribute* fInRectEdge; const Attribute* fInWidthHeight; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp index cde033ce8b..64ddc408fa 100644 --- a/src/gpu/ops/GrDashOp.cpp +++ b/src/gpu/ops/GrDashOp.cpp @@ -794,7 +794,7 @@ private: const Attribute* fInDashParams; const Attribute* fInCircleParams; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; @@ -1004,7 +1004,7 @@ private: const Attribute* fInDashParams; const Attribute* fInRectParams; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp index f49c8cd586..7b4c4a8277 100644 --- a/src/gpu/ops/GrMSAAPathRenderer.cpp +++ b/src/gpu/ops/GrMSAAPathRenderer.cpp @@ -209,7 +209,7 @@ private: const Attribute* fInColor; SkMatrix fViewMatrix; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; diff --git a/src/gpu/ops/GrNonAAFillRectOp.cpp b/src/gpu/ops/GrNonAAFillRectOp.cpp index c971e2f78b..1f61e0c68c 100644 --- a/src/gpu/ops/GrNonAAFillRectOp.cpp +++ b/src/gpu/ops/GrNonAAFillRectOp.cpp @@ -403,6 +403,8 @@ std::unique_ptr<GrDrawOp> MakeNonAAFillWithLocalRect(GrPaint&& paint, const SkMa /////////////////////////////////////////////////////////////////////////////////////////////////// +#if GR_TEST_UTILS + GR_DRAW_OP_TEST_DEFINE(NonAAFillRectOp) { SkRect rect = GrTest::TestRect(random); SkRect localRect = GrTest::TestRect(random); @@ -422,3 +424,5 @@ GR_DRAW_OP_TEST_DEFINE(NonAAFillRectOp) { return NonAAFillRectOp::Make(std::move(paint), viewMatrix, rect, lr, lm, aaType, stencil); } } + +#endif diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp index 45b290b980..1c80594343 100644 --- a/src/gpu/ops/GrOvalOpFactory.cpp +++ b/src/gpu/ops/GrOvalOpFactory.cpp @@ -213,7 +213,7 @@ private: const Attribute* fInUnionPlane; bool fStroke; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; @@ -351,7 +351,7 @@ private: SkMatrix fLocalMatrix; bool fStroke; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; @@ -519,7 +519,7 @@ private: SkMatrix fViewMatrix; DIEllipseStyle fStyle; - GR_DECLARE_GEOMETRY_PROCESSOR_TEST; + GR_DECLARE_GEOMETRY_PROCESSOR_TEST typedef GrGeometryProcessor INHERITED; }; diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp index 13a1c38d3f..d5b83930b5 100644 --- a/src/shaders/SkPerlinNoiseShader.cpp +++ b/src/shaders/SkPerlinNoiseShader.cpp @@ -737,7 +737,7 @@ private: this->addCoordTransform(&fCoordTransform); } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST SkPerlinNoiseShaderImpl::Type fType; GrCoordTransform fCoordTransform; @@ -1144,7 +1144,7 @@ private: this->addCoordTransform(&fCoordTransform); } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST GrCoordTransform fCoordTransform; int fOctaves; diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp index 9863b92179..0496aea33d 100644 --- a/src/shaders/gradients/SkLinearGradient.cpp +++ b/src/shaders/gradients/SkLinearGradient.cpp @@ -384,7 +384,7 @@ private: virtual void onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrGradientEffect INHERITED; }; diff --git a/src/shaders/gradients/SkRadialGradient.cpp b/src/shaders/gradients/SkRadialGradient.cpp index 7142b5898e..06135e8e01 100644 --- a/src/shaders/gradients/SkRadialGradient.cpp +++ b/src/shaders/gradients/SkRadialGradient.cpp @@ -265,7 +265,7 @@ private: virtual void onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrGradientEffect INHERITED; }; diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp index 64a0218540..40cfe68087 100644 --- a/src/shaders/gradients/SkSweepGradient.cpp +++ b/src/shaders/gradients/SkSweepGradient.cpp @@ -162,7 +162,7 @@ private: virtual void onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrGradientEffect INHERITED; }; diff --git a/src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp index 1e3404cdd6..52772656a3 100644 --- a/src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -121,7 +121,7 @@ private: this->addCoordTransform(&fBTransform); } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST // @{ // Cache of values - these can change arbitrarily, EXCEPT @@ -409,7 +409,7 @@ private: this->initClassID<FocalOutside2PtConicalEffect>(); } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST SkScalar fFocalX; bool fIsFlipped; @@ -616,7 +616,7 @@ private: this->initClassID<FocalInside2PtConicalEffect>(); } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST SkScalar fFocalX; @@ -859,7 +859,7 @@ private: this->initClassID<CircleInside2PtConicalEffect>(); } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST const CircleConicalInfo fInfo; @@ -1087,7 +1087,7 @@ private: fIsFlipped = shader.isFlippedGrad(); } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST const CircleConicalInfo fInfo; SkScalar fTLimit; diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp index ac56f03c92..405fb0e6ce 100644 --- a/src/sksl/SkSLHCodeGenerator.cpp +++ b/src/sksl/SkSLHCodeGenerator.cpp @@ -226,7 +226,7 @@ bool HCodeGenerator::generateCode() { " void onGetGLSLProcessorKey(const GrShaderCaps&," "GrProcessorKeyBuilder*) const override;\n" " bool onIsEqual(const GrFragmentProcessor&) const override;\n" - " GR_DECLARE_FRAGMENT_PROCESSOR_TEST;\n"); + " GR_DECLARE_FRAGMENT_PROCESSOR_TEST\n"); this->writeFields(); this->writef(" typedef GrFragmentProcessor INHERITED;\n" "};\n"); diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 4a89d0a9bf..c6616b1b79 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -83,7 +83,7 @@ private: } bool onIsEqual(const GrFragmentProcessor&) const override { return true; } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index 8862c56874..64b4e71d8e 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -96,7 +96,7 @@ DEF_TEST(SkSLFPHelloWorld, r) { " void onGetGLSLProcessorKey(const GrShaderCaps&,GrProcessorKeyBuilder*) " "const override;\n" " bool onIsEqual(const GrFragmentProcessor&) const override;\n" - " GR_DECLARE_FRAGMENT_PROCESSOR_TEST;\n" + " GR_DECLARE_FRAGMENT_PROCESSOR_TEST\n" " typedef GrFragmentProcessor INHERITED;\n" "};\n" "#endif\n" @@ -287,7 +287,7 @@ DEF_TEST(SkSLFPSections, r) { "}", *SkSL::ShaderCapsFactory::Default(), { - "GR_DECLARE_FRAGMENT_PROCESSOR_TEST;\n" + "GR_DECLARE_FRAGMENT_PROCESSOR_TEST\n" " fields section typedef GrFragmentProcessor INHERITED;" }, {}); |