diff options
author | 2017-07-24 10:16:19 -0400 | |
---|---|---|
committer | 2017-07-24 15:43:09 +0000 | |
commit | 1c053644a844db6b6ef454db10b058072e5c4249 (patch) | |
tree | 3c1734a6b4a35b8d575057127793b6ad00e2c0b0 /src/gpu/GrProcessor.cpp | |
parent | 8e5be413c10bc5fa816f56a8b69f9962c4565eac (diff) |
Make GrProcessorTestFactory be templated on smart ptr class rather than processor class.
This is part of setting the stage for moving GrFragmentProcessor to unique_ptr ownership.
Change-Id: I2dfb4977319605d56c4debe05ff0b3dc970bb4c5
Reviewed-on: https://skia-review.googlesource.com/26141
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrProcessor.cpp')
-rw-r--r-- | src/gpu/GrProcessor.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index bff33489fa..52aae6854c 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -33,17 +33,15 @@ class GrGeometryProcessor; * Originally these were both in the processor unit test header, but then it seemed to cause linker * problems on android. */ -template<> -SkTArray<GrProcessorTestFactory<GrFragmentProcessor>*, true>* -GrProcessorTestFactory<GrFragmentProcessor>::GetFactories() { - static SkTArray<GrProcessorTestFactory<GrFragmentProcessor>*, true> gFactories; +template <> +SkTArray<GrFragmentProcessorTestFactory*, true>* GrFragmentProcessorTestFactory::GetFactories() { + static SkTArray<GrFragmentProcessorTestFactory*, true> gFactories; return &gFactories; } -template<> -SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true>* -GrProcessorTestFactory<GrGeometryProcessor>::GetFactories() { - static SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true> gFactories; +template <> +SkTArray<GrGeometryProcessorTestFactory*, true>* GrGeometryProcessorTestFactory::GetFactories() { + static SkTArray<GrGeometryProcessorTestFactory*, true> gFactories; return &gFactories; } @@ -61,8 +59,8 @@ static const int kFPFactoryCount = 42; static const int kGPFactoryCount = 14; static const int kXPFactoryCount = 4; -template<> -void GrProcessorTestFactory<GrFragmentProcessor>::VerifyFactoryCount() { +template <> +void GrFragmentProcessorTestFactory::VerifyFactoryCount() { if (kFPFactoryCount != GetFactories()->count()) { SkDebugf("\nExpected %d fragment processor factories, found %d.\n", kFPFactoryCount, GetFactories()->count()); @@ -70,8 +68,8 @@ void GrProcessorTestFactory<GrFragmentProcessor>::VerifyFactoryCount() { } } -template<> -void GrProcessorTestFactory<GrGeometryProcessor>::VerifyFactoryCount() { +template <> +void GrGeometryProcessorTestFactory::VerifyFactoryCount() { if (kGPFactoryCount != GetFactories()->count()) { SkDebugf("\nExpected %d geometry processor factories, found %d.\n", kGPFactoryCount, GetFactories()->count()); |