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

Unified Diff: gm/image_pict.cpp

Issue 1404433002: Remove image usage type enum. Use GrTextureParams instead. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix no gpu build 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gm/texturedomaineffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/image_pict.cpp
diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
index 53ae99022aa5d6a403242a8ecde4146ebae77bd1..72590094c853eac6fd69cf70dafa40f9174476ea 100644
--- a/gm/image_pict.cpp
+++ b/gm/image_pict.cpp
@@ -220,7 +220,8 @@ public:
fTexture.reset(SkRef(image->getTexture()));
}
protected:
- GrTexture* onGenerateTexture(GrContext* ctx, SkImageUsageType, const SkIRect* subset) override {
+ GrTexture* onGenerateTexture(GrContext* ctx, const GrTextureParams& params,
+ const SkIRect* subset) override {
if (ctx) {
SkASSERT(ctx == fCtx.get());
}
@@ -310,7 +311,7 @@ protected:
static void draw_as_tex(SkCanvas* canvas, SkImageCacherator* cache, SkScalar x, SkScalar y) {
#if SK_SUPPORT_GPU
SkAutoTUnref<GrTexture> texture(cache->lockAsTexture(canvas->getGrContext(),
- kUntiled_SkImageUsageType,
+ GrTextureParams::ClampBilerp(),
nullptr));
if (!texture) {
// show placeholder if we have no texture
« no previous file with comments | « no previous file | gm/texturedomaineffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698