diff options
| author |  Hal Canary <halcanary@google.com> | 2017-01-31 13:50:44 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-02 12:49:17 +0000 |
| commit | 6f6961ebad65c582318564b3688e78e5c99f3935 (patch) | |
| tree | 7144abfca88062d39092c567a006b6787297a50b /include | |
| parent | 351b045a5e2cbfe41abf4296f9a984ea9ac307e8 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrProcessorUnitTest.h | 23 | ||||
| -rw-r--r-- | include/gpu/GrTestUtils.h | 2 |
2 files changed, 21 insertions, 4 deletions
diff --git a/include/gpu/GrProcessorUnitTest.h b/include/gpu/GrProcessorUnitTest.h index a56db8188b..748a522c57 100644 --- a/include/gpu/GrProcessorUnitTest.h +++ b/include/gpu/GrProcessorUnitTest.h @@ -8,10 +8,13 @@ #ifndef GrProcessorUnitTest_DEFINED #define GrProcessorUnitTest_DEFINED +#include "SkTypes.h" + +#if GR_TEST_UTILS + #include "../private/GrTextureProxy.h" #include "../private/SkTArray.h" #include "GrTestUtils.h" -#include "SkTypes.h" class SkMatrix; class GrCaps; @@ -183,5 +186,19 @@ private: const GrXPFactory* TestGet(GrProcessorTestData*) #define GR_DEFINE_XP_FACTORY_TEST(X) -#endif // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS -#endif +#endif // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS +#else // GR_TEST_UTILS + #define GR_DECLARE_GEOMETRY_PROCESSOR_TEST + #define GR_DECLARE_FRAGMENT_PROCESSOR_TEST + #define GR_DECLARE_XP_FACTORY_TEST + #define GR_DEFINE_FRAGMENT_PROCESSOR_TEST(...) + #define GR_DEFINE_GEOMETRY_PROCESSOR_TEST(...) + #define GR_DEFINE_XP_FACTORY_TEST(...) + #define GR_DECLARE_FRAGMENT_PROCESSOR_TEST + #define GR_DEFINE_FRAGMENT_PROCESSOR_TEST(...) + #define GR_DECLARE_GEOMETRY_PROCESSOR_TEST + #define GR_DEFINE_GEOMETRY_PROCESSOR_TEST(...) + #define GR_DECLARE_XP_FACTORY_TEST + #define GR_DEFINE_XP_FACTORY_TEST(...) +#endif // GR_TEST_UTILS +#endif // GrProcessorUnitTest_DEFINED diff --git a/include/gpu/GrTestUtils.h b/include/gpu/GrTestUtils.h index 373847dfe9..5bb1cc1738 100644 --- a/include/gpu/GrTestUtils.h +++ b/include/gpu/GrTestUtils.h @@ -10,7 +10,7 @@ #include "SkTypes.h" -#ifdef GR_TEST_UTILS +#if GR_TEST_UTILS #include "GrColor.h" #include "GrColorSpaceXform.h" |