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

Side by Side Diff: src/gpu/SkGr.cpp

Issue 726913002: Revert of Replace GrResourceCache with GrResourceCache2. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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/GrTexture.cpp ('k') | tests/ResourceCacheTest.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 2010 Google Inc. 2 * Copyright 2010 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 "SkGr.h" 8 #include "SkGr.h"
9 #include "SkColorFilter.h" 9 #include "SkColorFilter.h"
10 #include "SkConfig8888.h" 10 #include "SkConfig8888.h"
11 #include "SkData.h" 11 #include "SkData.h"
12 #include "SkMessageBus.h" 12 #include "SkMessageBus.h"
13 #include "SkPixelRef.h" 13 #include "SkPixelRef.h"
14 #include "SkTextureCompressor.h" 14 #include "SkTextureCompressor.h"
15 #include "GrResourceCache.h"
15 #include "GrGpu.h" 16 #include "GrGpu.h"
16 #include "effects/GrDitherEffect.h" 17 #include "effects/GrDitherEffect.h"
17 #include "GrDrawTargetCaps.h" 18 #include "GrDrawTargetCaps.h"
18 #include "effects/GrYUVtoRGBEffect.h" 19 #include "effects/GrYUVtoRGBEffect.h"
19 20
20 #ifndef SK_IGNORE_ETC1_SUPPORT 21 #ifndef SK_IGNORE_ETC1_SUPPORT
21 # include "ktx.h" 22 # include "ktx.h"
22 # include "etc1.h" 23 # include "etc1.h"
23 #endif 24 #endif
24 25
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 if (shader->asFragmentProcessor(context, skPaint, NULL, &paintColor, &fp ) && fp) { 574 if (shader->asFragmentProcessor(context, skPaint, NULL, &paintColor, &fp ) && fp) {
574 grPaint->addColorProcessor(fp)->unref(); 575 grPaint->addColorProcessor(fp)->unref();
575 constantColor = false; 576 constantColor = false;
576 } 577 }
577 } 578 }
578 579
579 // The grcolor is automatically set when calling asFragmentProcessor. 580 // The grcolor is automatically set when calling asFragmentProcessor.
580 // If the shader can be seen as an effect it returns true and adds its effec t to the grpaint. 581 // If the shader can be seen as an effect it returns true and adds its effec t to the grpaint.
581 SkPaint2GrPaintNoShader(context, skPaint, paintColor, constantColor, grPaint ); 582 SkPaint2GrPaintNoShader(context, skPaint, paintColor, constantColor, grPaint );
582 } 583 }
OLDNEW
« no previous file with comments | « src/gpu/GrTexture.cpp ('k') | tests/ResourceCacheTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698