diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-07-06 10:09:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-06 14:35:45 +0000 |
| commit | 0c26a9dbd0b6546731df63c01411cb2aaa5ba236 (patch) | |
| tree | 02779da50097086c27bc5f0a1885e419ad4162a5 /src/gpu/GrProcessorUnitTest.h | |
| parent | 7c26ca770b08bd75dd8f347350a0f958953d3071 (diff) | |
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>
Diffstat (limited to 'src/gpu/GrProcessorUnitTest.h')
| -rw-r--r-- | src/gpu/GrProcessorUnitTest.h | 12 |
1 files changed, 6 insertions, 6 deletions
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 |