| 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 "GrCoordTransform.h" | 10 #include "GrCoordTransform.h" |
| 11 #include "GrGeometryData.h" | 11 #include "GrGeometryData.h" |
| 12 #include "GrInvariantOutput.h" | 12 #include "GrInvariantOutput.h" |
| 13 #include "GrMemoryPool.h" | 13 #include "GrMemoryPool.h" |
| 14 #include "GrXferProcessor.h" |
| 14 #include "SkTLS.h" | 15 #include "SkTLS.h" |
| 15 | 16 |
| 16 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS | 17 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS |
| 17 | 18 |
| 18 class GrFragmentProcessor; | 19 class GrFragmentProcessor; |
| 19 class GrGeometryProcessor; | 20 class GrGeometryProcessor; |
| 20 | 21 |
| 21 /* | 22 /* |
| 22 * Originally these were both in the processor unit test header, but then it see
med to cause linker | 23 * Originally these were both in the processor unit test header, but then it see
med to cause linker |
| 23 * problems on android. | 24 * problems on android. |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 /* | 173 /* |
| 173 * GrGeometryData shares the same pool so it lives in this file too | 174 * GrGeometryData shares the same pool so it lives in this file too |
| 174 */ | 175 */ |
| 175 void* GrGeometryData::operator new(size_t size) { | 176 void* GrGeometryData::operator new(size_t size) { |
| 176 return GrProcessor_Globals::GetTLS()->allocate(size); | 177 return GrProcessor_Globals::GetTLS()->allocate(size); |
| 177 } | 178 } |
| 178 | 179 |
| 179 void GrGeometryData::operator delete(void* target) { | 180 void GrGeometryData::operator delete(void* target) { |
| 180 GrProcessor_Globals::GetTLS()->release(target); | 181 GrProcessor_Globals::GetTLS()->release(target); |
| 181 } | 182 } |
| 183 |
| 184 ////////////////////////////////////////////////////////////////////////////////
/////////////////// |
| 185 |
| 186 // Initial static variable from GrXPFactory |
| 187 int32_t GrXPFactory::gCurrXPFClassID = |
| 188 GrXPFactory::kIllegalXPFClassID; |
| 189 |
| OLD | NEW |