Index: include/gpu/GrProcessorUnitTest.h |
diff --git a/include/gpu/GrProcessorUnitTest.h b/include/gpu/GrProcessorUnitTest.h |
index 4b97483c0fa438f017c2c6728ed04c2b5084bd44..fbf4382d69533011541581d6548db4741e36cb66 100644 |
--- a/include/gpu/GrProcessorUnitTest.h |
+++ b/include/gpu/GrProcessorUnitTest.h |
@@ -149,14 +149,6 @@ |
const GrDrawTargetCaps&, \ |
GrTexture* dummyTextures[2]) |
-#define GR_DECLARE_XP_FACTORY_TEST \ |
- static GrProcessorTestFactory<GrXPFactory> gTestFactory SK_UNUSED; \ |
- static GrXPFactory* TestCreate(SkRandom*, \ |
- GrContext*, \ |
- const GrDrawTargetCaps&, \ |
- GrTexture* dummyTextures[2]) |
- |
- |
/** GrProcessor subclasses should insert this macro in their implementation file. They must then |
* also implement this static function: |
* GrProcessor* TestCreate(SkRandom*, |
@@ -171,9 +163,6 @@ |
#define GR_DEFINE_FRAGMENT_PROCESSOR_TEST(Effect) \ |
GrProcessorTestFactory<GrFragmentProcessor> Effect :: gTestFactory(Effect :: TestCreate) |
-#define GR_DEFINE_XP_FACTORY_TEST(Factory) \ |
- GrProcessorTestFactory<GrXPFactory> Factory :: gTestFactory(Factory :: TestCreate) |
- |
#define GR_DEFINE_GEOMETRY_PROCESSOR_TEST(Effect) \ |
GrProcessorTestFactory<GrGeometryProcessor> Effect :: gTestFactory(Effect :: TestCreate) |
@@ -183,27 +172,18 @@ |
// its definitions will compile. |
#define GR_DECLARE_FRAGMENT_PROCESSOR_TEST \ |
static GrFragmentProcessor* TestCreate(SkRandom*, \ |
- GrContext*, \ |
- const GrDrawTargetCaps&, \ |
- GrTexture* dummyTextures[2]) |
+ GrContext*, \ |
+ const GrDrawTargetCaps&, \ |
+ GrTexture* dummyTextures[2]) |
#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_XP_FACTORY_TEST \ |
- static GrXPFactory* TestCreate(SkRandom*, \ |
- GrContext*, \ |
- const GrDrawTargetCaps&, \ |
- GrTexture* dummyTextures[2]) |
-#define GR_DEFINE_XP_FACTORY_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 GrGeometryProcessor* TestCreate(SkRandom*, \ |
- GrContext*, \ |
- const GrDrawTargetCaps&, \ |
- GrTexture* dummyTextures[2]) |
+ GrContext*, \ |
+ const GrDrawTargetCaps&, \ |
+ GrTexture* dummyTextures[2]) |
#define GR_DEFINE_GEOMETRY_PROCESSOR_TEST(X) |
#endif // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS |