diff options
author | Robert Phillips <robertphillips@google.com> | 2017-03-21 13:26:13 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-21 13:26:22 +0000 |
commit | eaa78c45002b4a6e43f4fe2028652b050132dad2 (patch) | |
tree | 00c45b889ac05a1a7e34a33f0e301bb2f73b4e5c /src/gpu/SkGr.h | |
parent | 107524c2a26e81ebeb2edaa62a96df3bcde0d0c7 (diff) |
Revert "Make SkImage_Gpu be deferred"
This reverts commit 0db235bc0278887c344eb25b4681e9cca4cf892a.
Reason for revert: cc_unittests failing
Original change's description:
> Make SkImage_Gpu be deferred
>
> This CL removes the GrTexture-based ctor forcing everyone to create deferred SkImage_Gpus.
>
> split out into:
> https://skia-review.googlesource.com/c/9106/ (Remove atlas creation from GrResourceProvider)
>
> Change-Id: I266bbe089c242fe54d5b7adcc7895aa5a39440a0
> Reviewed-on: https://skia-review.googlesource.com/6680
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ia15590a1fae04b52723713760fdbf0492ad36286
Reviewed-on: https://skia-review.googlesource.com/9962
Reviewed-by: Robert Phillips <robertphillips@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, 0 insertions, 5 deletions
diff --git a/src/gpu/SkGr.h b/src/gpu/SkGr.h index b9fa0e8867..993bf839bb 100644 --- a/src/gpu/SkGr.h +++ b/src/gpu/SkGr.h @@ -236,11 +236,6 @@ 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]); |