diff options
author | Brian Salomon <bsalomon@google.com> | 2017-01-07 09:37:13 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-09 15:44:53 +0000 |
commit | a8f80de2bc17672b4b6f26d3cf6b38123ac850c9 (patch) | |
tree | ae254be1a14e5ccaf0e0d8deffc43eff2983b923 /src/gpu/GrProcessor.cpp | |
parent | c083e4f586831459ef7b8e197a5bee3b189b8511 (diff) |
Removing ref counting from GrXPFactory.
All GrXPFactory instances are static constexpr.
Change-Id: If1086b08534166201e53b3fd9379104e361eb5e6
Reviewed-on: https://skia-review.googlesource.com/6701
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrProcessor.cpp')
-rw-r--r-- | src/gpu/GrProcessor.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 991aa90453..0512aa85fe 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -32,19 +32,17 @@ GrProcessorTestFactory<GrFragmentProcessor>::GetFactories() { } template<> -SkTArray<GrProcessorTestFactory<GrXPFactory>*, true>* -GrProcessorTestFactory<GrXPFactory>::GetFactories() { - static SkTArray<GrProcessorTestFactory<GrXPFactory>*, true> gFactories; - return &gFactories; -} - -template<> SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true>* GrProcessorTestFactory<GrGeometryProcessor>::GetFactories() { static SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true> gFactories; return &gFactories; } +SkTArray<GrXPFactoryTestFactory*, true>* GrXPFactoryTestFactory::GetFactories() { + static SkTArray<GrXPFactoryTestFactory*, true> gFactories; + return &gFactories; +} + /* * To ensure we always have successful static initialization, before creating from the factories * we verify the count is as expected. If a new factory is added, then these numbers must be @@ -72,8 +70,7 @@ void GrProcessorTestFactory<GrGeometryProcessor>::VerifyFactoryCount() { } } -template<> -void GrProcessorTestFactory<GrXPFactory>::VerifyFactoryCount() { +void GrXPFactoryTestFactory::VerifyFactoryCount() { if (kXPFactoryCount != GetFactories()->count()) { SkDebugf("\nExpected %d xp factory factories, found %d.\n", kXPFactoryCount, GetFactories()->count()); @@ -229,8 +226,3 @@ GrProcessor::ImageStorageAccess::ImageStorageAccess(sk_sp<GrTexture> texture, Gr break; } } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// Initial static variable from GrXPFactory -int32_t GrXPFactory::gCurrXPFClassID = GrXPFactory::kIllegalXPFClassID; |