diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-27 11:08:16 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-27 16:31:02 +0000 |
| commit | 3798c86f6885f0b47fb2e659a43b48a4468a97ef (patch) | |
| tree | 8670d4adcc7889af63b4168256f0325aa78aa3bd /src/core/SkImageCacherator.cpp | |
| parent | 465748c246dde8c131effdfa69aed82ef7a48af8 (diff) | |
Remove GrFragmentProcessor-derived class' GrTexture-based ctors
Split out into:
https://skia-review.googlesource.com/c/8881/ (Switch GrTextureStripAtlas over to GrTextureProxies)
https://skia-review.googlesource.com/c/8942/ (Wrap cached GrTextures in GrTextureProxies (e.g., blur profiles, nine-patch blurs, etc.))
https://skia-review.googlesource.com/c/8997/ (Clean up/remove unused GrFragmentProcessor-derived ctors)
https://skia-review.googlesource.com/c/9191/ (Switch SkImageGenerator over to generating GrTextureProxies)
https://skia-review.googlesource.com/c/9448/ (Switch GrYUVProvider over to GrTextureProxies)
https://skia-review.googlesource.com/c/9559/ (Preparatory Proxification)
https://skia-review.googlesource.com/c/9626/ (Consolidate Proxy caching code in GrResourceProvider)
https://skia-review.googlesource.com/c/9683/ (More pre-emptive proxification)
https://skia-review.googlesource.com/c/9917/ (Make experimental Perlin noise shader take texture proxies)
https://skia-review.googlesource.com/c/9961/ (rename makeCopyForTextureParams to isACopyNeededForTextureParams)
https://skia-review.googlesource.com/c/9945/ (Make SkImageCacherator be deferred)
https://skia-review.googlesource.com/c/10180/ (Add new proxy-based DetermineDomainMode w/ test)
Change-Id: Ia33389d92360e542a9d2bf395948deb04d017465
Reviewed-on: https://skia-review.googlesource.com/8823
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/core/SkImageCacherator.cpp')
| -rw-r--r-- | src/core/SkImageCacherator.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index 06d2279946..76da0e762e 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -627,12 +627,10 @@ sk_sp<GrTextureProxy> SkImageCacherator::lockAsTextureProxy(GrContext* ctx, return nullptr; } - sk_sp<GrTexture> tex(GrImageTextureMaker(ctx, this, client, chint).refTextureForParams( - params, + return GrImageTextureMaker(ctx, this, client, chint).refTextureProxyForParams(params, dstColorSpace, texColorSpace, - scaleAdjust)); - return GrSurfaceProxy::MakeWrapped(std::move(tex)); + scaleAdjust); } #endif |