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

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

Issue 1734043002: Revert of Move Budgeted enum out of SkSurface, use in GrTextureProvider (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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/effects/GrConfigConversionEffect.cpp ('k') | src/gpu/gl/GrGLGpu.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 * 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 "GrTextureStripAtlas.h" 8 #include "GrTextureStripAtlas.h"
9 #include "GrContext.h" 9 #include "GrContext.h"
10 #include "GrTexture.h" 10 #include "GrTexture.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 texDesc.fConfig = fDesc.fConfig; 196 texDesc.fConfig = fDesc.fConfig;
197 197
198 static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain(); 198 static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
199 GrUniqueKey key; 199 GrUniqueKey key;
200 GrUniqueKey::Builder builder(&key, kDomain, 1); 200 GrUniqueKey::Builder builder(&key, kDomain, 1);
201 builder[0] = static_cast<uint32_t>(fCacheKey); 201 builder[0] = static_cast<uint32_t>(fCacheKey);
202 builder.finish(); 202 builder.finish();
203 203
204 fTexture = fDesc.fContext->textureProvider()->findAndRefTextureByUniqueKey(k ey); 204 fTexture = fDesc.fContext->textureProvider()->findAndRefTextureByUniqueKey(k ey);
205 if (nullptr == fTexture) { 205 if (nullptr == fTexture) {
206 fTexture = fDesc.fContext->textureProvider()->createTexture(texDesc, SkB udgeted::kYes, 206 fTexture = fDesc.fContext->textureProvider()->createTexture(texDesc, tru e, nullptr, 0);
207 nullptr, 0);
208 if (!fTexture) { 207 if (!fTexture) {
209 return; 208 return;
210 } 209 }
211 fDesc.fContext->textureProvider()->assignUniqueKeyToTexture(key, fTextur e); 210 fDesc.fContext->textureProvider()->assignUniqueKeyToTexture(key, fTextur e);
212 // This is a new texture, so all of our cache info is now invalid 211 // This is a new texture, so all of our cache info is now invalid
213 this->initLRU(); 212 this->initLRU();
214 fKeyTable.rewind(); 213 fKeyTable.rewind();
215 } 214 }
216 SkASSERT(fTexture); 215 SkASSERT(fTexture);
217 } 216 }
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « src/gpu/effects/GrConfigConversionEffect.cpp ('k') | src/gpu/gl/GrGLGpu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698