diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-21 16:22:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-22 11:52:16 +0000 |
| commit | 0ae6faa34d73ffc7ebec3d13f0473703bade821b (patch) | |
| tree | d54d076330e9da961cd198732aca245ee7b4a646 /src/gpu/SkGr.h | |
| parent | 54d212e1bfaea0be88c3c40820d0b1ae0daebecf (diff) | |
Make SkImage_Gpu be deferred (take 2)
This CL removes the GrTexture-based ctor forcing everyone to create deferred SkImage_Gpus.
relanding of: https://skia-review.googlesource.com/c/6680/ (Make SkImage_Gpu be deferred)
split out into:
https://skia-review.googlesource.com/c/9106/ (Remove atlas creation from GrResourceProvider)
Change-Id: I834ede430b9706cf9b675bdfdddf1c8c624c2f14
Reviewed-on: https://skia-review.googlesource.com/9965
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/SkGr.h')
| -rw-r--r-- | src/gpu/SkGr.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gpu/SkGr.h b/src/gpu/SkGr.h index c8990b6a0a..eb6d225f04 100644 --- a/src/gpu/SkGr.h +++ b/src/gpu/SkGr.h @@ -241,6 +241,11 @@ sk_sp<GrTextureProxy> GrUploadPixmapToTextureProxy(GrResourceProvider*, GrTexture* GrUploadMipMapToTexture(GrContext*, const SkImageInfo&, const GrMipLevel* texels, int mipLevelCount, SkDestinationSurfaceColorMode colorMode); +sk_sp<GrTextureProxy> GrUploadMipMapToTextureProxy(GrContext*, const SkImageInfo&, + const GrMipLevel* texels, + int mipLevelCount, + SkDestinationSurfaceColorMode colorMode); + sk_sp<GrTexture> GrMakeCachedBitmapTexture(GrContext*, const SkBitmap&, const GrSamplerParams&, SkScalar scaleAdjust[2]); |