diff options
| author |  Brian Osman <brianosman@google.com> | 2017-03-20 11:03:55 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-20 16:42:44 +0000 |
| commit | ed182d7c9020a0a533ada3e601183f34e4da7504 (patch) | |
| tree | 1ca8417b2bff4252be8d0acd5dbdef003b68bec5 /include | |
| parent | dcf0ab0dc5ba42a3bb8ec034abc5cf5d5f1faf5b (diff) | |
Remove SkImage::MakeTextureFromPixmap
Slight variation on https://skia-review.googlesource.com/c/7346/,
which had to be reverted. This version also changes the non-mip
upload path to use a GrTextureProxy. Hopefully this doesn't trigger
the same perf regression that we saw last time.
BUG=skia:
Change-Id: Ic99bdd93904089942fb680c3af9c4c36310074c0
Reviewed-on: https://skia-review.googlesource.com/9892
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkImage.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 7235580481..f50489771e 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -169,8 +169,6 @@ public: const SkMatrix*, const SkPaint*, BitDepth, sk_sp<SkColorSpace>); - static sk_sp<SkImage> MakeTextureFromPixmap(GrContext*, const SkPixmap&, SkBudgeted budgeted); - /////////////////////////////////////////////////////////////////////////////////////////////// int width() const { return fWidth; } |