Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/gpu/effects/GrTextureStripAtlas.cpp

Issue 1397123002: Move functions from SkGr to SkGrPriv.h (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 9th time's a charm? Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/SkGrPriv.h ('k') | src/gpu/effects/GrXfermodeFragmentProcessor.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "GrTextureStripAtlas.h" 9 #include "GrTextureStripAtlas.h"
10 #include "GrContext.h"
11 #include "GrTexture.h"
12 #include "SkGr.h"
10 #include "SkPixelRef.h" 13 #include "SkPixelRef.h"
11 #include "SkTSearch.h" 14 #include "SkTSearch.h"
12 #include "GrTexture.h"
13 15
14 #ifdef SK_DEBUG 16 #ifdef SK_DEBUG
15 #define VALIDATE this->validate() 17 #define VALIDATE this->validate()
16 #else 18 #else
17 #define VALIDATE 19 #define VALIDATE
18 #endif 20 #endif
19 21
20 class GrTextureStripAtlas::Hash : public SkTDynamicHash<GrTextureStripAtlas::Atl asEntry, 22 class GrTextureStripAtlas::Hash : public SkTDynamicHash<GrTextureStripAtlas::Atl asEntry,
21 GrTextureStripAtlas::Des c> {}; 23 GrTextureStripAtlas::Des c> {};
22 24
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 342
341 // If we have locked rows, we should have a locked texture, otherwise 343 // If we have locked rows, we should have a locked texture, otherwise
342 // it should be unlocked 344 // it should be unlocked
343 if (fLockedRows == 0) { 345 if (fLockedRows == 0) {
344 SkASSERT(nullptr == fTexture); 346 SkASSERT(nullptr == fTexture);
345 } else { 347 } else {
346 SkASSERT(fTexture); 348 SkASSERT(fTexture);
347 } 349 }
348 } 350 }
349 #endif 351 #endif
OLDNEW
« no previous file with comments | « src/gpu/SkGrPriv.h ('k') | src/gpu/effects/GrXfermodeFragmentProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698