diff options
| author |  Brian Osman <brianosman@google.com> | 2017-01-25 14:13:00 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-25 14:54:35 +0000 |
| commit | b92234a3210bce532f103d71002f4e04d336a182 (patch) | |
| tree | 2d0e7a4cf5d912af913a5dbcce7f6bb14f94a256 /include | |
| parent | e330eb2c0e6bab83add6986119864b546bf0b0a7 (diff) | |
Revert "Remove SkImage::MakeTextureFromPixmap"
This reverts commit 8ccbbb455c6ef194920c47e846b95b50f5017138.
Reason for revert: Chrome perf regression
BUG=chrome:684483
Original change's description:
> Remove SkImage::MakeTextureFromPixmap
>
> Another step towards reducing the number of texture upload paths.
>
> BUG=skia:
>
> Change-Id: Ica185e7334f52dc9ebf87e21fe6f60589ef87bb3
> Reviewed-on: https://skia-review.googlesource.com/7346
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com,cblume@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
BUG=skia:
Change-Id: I8bf6970b764018f3ebcac8123e4d6a8ad05317ff
Reviewed-on: https://skia-review.googlesource.com/7484
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkImage.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 92b8f80633..076da331a2 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -175,6 +175,8 @@ public: const SkMatrix*, const SkPaint*, BitDepth, sk_sp<SkColorSpace>); + static sk_sp<SkImage> MakeTextureFromPixmap(GrContext*, const SkPixmap&, SkBudgeted budgeted); + /////////////////////////////////////////////////////////////////////////////////////////////// int width() const { return fWidth; } |