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/gpu/GrTextureMaker.h | |
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/gpu/GrTextureMaker.h')
-rw-r--r-- | src/gpu/GrTextureMaker.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gpu/GrTextureMaker.h b/src/gpu/GrTextureMaker.h index 7c0621beb2..909d3480bf 100644 --- a/src/gpu/GrTextureMaker.h +++ b/src/gpu/GrTextureMaker.h @@ -23,8 +23,10 @@ public: * in order to correct the absolute texture coordinates. * Places the color space of the texture in (*texColorSpace). */ - GrTexture* refTextureForParams(const GrSamplerParams&, SkColorSpace* dstColorSpace, - sk_sp<SkColorSpace>* texColorSpace, SkScalar scaleAdjust[2]); + sk_sp<GrTextureProxy> refTextureProxyForParams(const GrSamplerParams&, + SkColorSpace* dstColorSpace, + sk_sp<SkColorSpace>* texColorSpace, + SkScalar scaleAdjust[2]); sk_sp<GrFragmentProcessor> createFragmentProcessor( const SkMatrix& textureMatrix, @@ -62,8 +64,9 @@ protected: * Subclass may override this if they can handle creating the texture more directly than * by copying. */ - virtual GrTexture* generateTextureForParams(const CopyParams&, bool willBeMipped, - SkColorSpace* dstColorSpace); + virtual sk_sp<GrTextureProxy> generateTextureProxyForParams(const CopyParams&, + bool willBeMipped, + SkColorSpace* dstColorSpace); GrContext* context() const { return fContext; } |