| OLD | NEW |
| 1 | |
| 2 /* | 1 /* |
| 3 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 4 * | 3 * |
| 5 * 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 |
| 6 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 7 */ | 6 */ |
| 8 | 7 |
| 9 #include "GrTextureStripAtlas.h" | 8 #include "GrTextureStripAtlas.h" |
| 10 #include "GrContext.h" | 9 #include "GrContext.h" |
| 11 #include "GrTexture.h" | 10 #include "GrTexture.h" |
| 12 #include "SkGr.h" | 11 #include "SkGr.h" |
| 13 #include "SkPixelRef.h" | 12 #include "SkPixelRef.h" |
| 14 #include "SkTSearch.h" | 13 #include "SkTSearch.h" |
| 15 | 14 |
| 16 #ifdef SK_DEBUG | 15 #ifdef SK_DEBUG |
| 17 #define VALIDATE this->validate() | 16 #define VALIDATE this->validate() |
| 18 #else | 17 #else |
| 19 #define VALIDATE | 18 #define VALIDATE |
| 20 #endif | 19 #endif |
| 21 | 20 |
| 22 class GrTextureStripAtlas::Hash : public SkTDynamicHash<GrTextureStripAtlas::Atl
asEntry, | 21 class GrTextureStripAtlas::Hash : public SkTDynamicHash<GrTextureStripAtlas::Atl
asEntry, |
| 23 GrTextureStripAtlas::Des
c> {}; | 22 GrTextureStripAtlas::Des
c> {}; |
| 24 | 23 |
| 25 int32_t GrTextureStripAtlas::gCacheCount = 0; | 24 int32_t GrTextureStripAtlas::gCacheCount = 0; |
| 26 | 25 |
| 27 GrTextureStripAtlas::Hash* GrTextureStripAtlas::gAtlasCache = nullptr; | 26 GrTextureStripAtlas::Hash* GrTextureStripAtlas::gAtlasCache = nullptr; |
| 28 | 27 |
| 29 GrTextureStripAtlas::Hash* GrTextureStripAtlas::GetCache() { | 28 GrTextureStripAtlas::Hash* GrTextureStripAtlas::GetCache() { |
| 30 | 29 |
| 31 if (nullptr == gAtlasCache) { | 30 if (nullptr == gAtlasCache) { |
| 32 gAtlasCache = new Hash; | 31 gAtlasCache = new Hash; |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 | 341 |
| 343 // If we have locked rows, we should have a locked texture, otherwise | 342 // If we have locked rows, we should have a locked texture, otherwise |
| 344 // it should be unlocked | 343 // it should be unlocked |
| 345 if (fLockedRows == 0) { | 344 if (fLockedRows == 0) { |
| 346 SkASSERT(nullptr == fTexture); | 345 SkASSERT(nullptr == fTexture); |
| 347 } else { | 346 } else { |
| 348 SkASSERT(fTexture); | 347 SkASSERT(fTexture); |
| 349 } | 348 } |
| 350 } | 349 } |
| 351 #endif | 350 #endif |
| OLD | NEW |