| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "GrProcessor.h" | 8 #include "GrProcessor.h" |
| 9 #include "GrContext.h" | 9 #include "GrContext.h" |
| 10 #include "GrGeometryProcessor.h" | 10 #include "GrGeometryProcessor.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 GrProcessorTestFactory<GrGeometryProcessor>::GetFactories() { | 41 GrProcessorTestFactory<GrGeometryProcessor>::GetFactories() { |
| 42 static SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true> gFactori
es; | 42 static SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true> gFactori
es; |
| 43 return &gFactories; | 43 return &gFactories; |
| 44 } | 44 } |
| 45 | 45 |
| 46 /* | 46 /* |
| 47 * To ensure we always have successful static initialization, before creating fr
om the factories | 47 * To ensure we always have successful static initialization, before creating fr
om the factories |
| 48 * we verify the count is as expected. If a new factory is added, then these nu
mbers must be | 48 * we verify the count is as expected. If a new factory is added, then these nu
mbers must be |
| 49 * manually adjusted. | 49 * manually adjusted. |
| 50 */ | 50 */ |
| 51 static const int kFPFactoryCount = 40; | 51 static const int kFPFactoryCount = 41; |
| 52 static const int kGPFactoryCount = 14; | 52 static const int kGPFactoryCount = 14; |
| 53 static const int kXPFactoryCount = 7; | 53 static const int kXPFactoryCount = 8; |
| 54 | 54 |
| 55 template<> | 55 template<> |
| 56 void GrProcessorTestFactory<GrFragmentProcessor>::VerifyFactoryCount() { | 56 void GrProcessorTestFactory<GrFragmentProcessor>::VerifyFactoryCount() { |
| 57 if (kFPFactoryCount != GetFactories()->count()) { | 57 if (kFPFactoryCount != GetFactories()->count()) { |
| 58 SkFAIL("Wrong number of fragment processor factories!"); | 58 SkFAIL("Wrong number of fragment processor factories!"); |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 | 61 |
| 62 template<> | 62 template<> |
| 63 void GrProcessorTestFactory<GrGeometryProcessor>::VerifyFactoryCount() { | 63 void GrProcessorTestFactory<GrGeometryProcessor>::VerifyFactoryCount() { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 } | 124 } |
| 125 } | 125 } |
| 126 return true; | 126 return true; |
| 127 } | 127 } |
| 128 | 128 |
| 129 ////////////////////////////////////////////////////////////////////////////////
/////////////////// | 129 ////////////////////////////////////////////////////////////////////////////////
/////////////////// |
| 130 | 130 |
| 131 // Initial static variable from GrXPFactory | 131 // Initial static variable from GrXPFactory |
| 132 int32_t GrXPFactory::gCurrXPFClassID = | 132 int32_t GrXPFactory::gCurrXPFClassID = |
| 133 GrXPFactory::kIllegalXPFClassID; | 133 GrXPFactory::kIllegalXPFClassID; |
| OLD | NEW |