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

Unified Diff: src/utils/SkImageGeneratorUtils.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 | « src/image/SkImage_Raster.cpp ('k') | tests/ReadPixelsTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkImageGeneratorUtils.cpp
diff --git a/src/utils/SkImageGeneratorUtils.cpp b/src/utils/SkImageGeneratorUtils.cpp
index 42a0fe518d606ea1f69fcace5ac1f0e081a38c44..8202dbe1339f2271f0efcd6c54022ee95c335f58 100644
--- a/src/utils/SkImageGeneratorUtils.cpp
+++ b/src/utils/SkImageGeneratorUtils.cpp
@@ -56,7 +56,8 @@ public:
{}
protected:
- GrTexture* onGenerateTexture(GrContext* ctx, SkImageUsageType, const SkIRect* subset) override {
+ GrTexture* onGenerateTexture(GrContext* ctx, const GrTextureParams&,
+ const SkIRect* subset) override {
if (ctx) {
SkASSERT(ctx == fCtx.get());
}
@@ -112,7 +113,8 @@ protected:
return fImage->readPixels(info, pixels, rowBytes, 0, 0);
}
- GrTexture* onGenerateTexture(GrContext* ctx, SkImageUsageType, const SkIRect* subset) override {
+ GrTexture* onGenerateTexture(GrContext* ctx, const GrTextureParams&,
+ const SkIRect* subset) override {
// waiting on https://code.google.com/p/skia/issues/detail?id=4233
return nullptr;
}
« no previous file with comments | « src/image/SkImage_Raster.cpp ('k') | tests/ReadPixelsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698