diff options
author | 2016-03-09 11:31:18 -0800 | |
---|---|---|
committer | 2016-03-09 11:31:18 -0800 | |
commit | 045afea97902936869d71389e656a9c6917fa32f (patch) | |
tree | 54881d84720868e0ed7bcdc7540f636ed2183f72 /src/image | |
parent | 7d825f8d5ce2a705a345168936a48bf51f54f1b3 (diff) |
Add SkImage::NewTextureFromPixmap
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1776913003
Review URL: https://codereview.chromium.org/1776913003
Diffstat (limited to 'src/image')
-rw-r--r-- | src/image/SkImage.cpp | 4 | ||||
-rw-r--r-- | src/image/SkImage_Gpu.cpp | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 674a735743..07279501a3 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -343,6 +343,10 @@ bool SkImage::isLazyGenerated() const { #if !SK_SUPPORT_GPU +SkImage* SkImage::NewTextureFromPixmap(GrContext*, const SkPixmap&, SkBudgeted budgeted) { + return nullptr; +} + SkImage* SkImage::NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType, TextureReleaseProc, ReleaseContext) { return nullptr; diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 57ee33957b..b87e50ba0a 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -310,6 +310,19 @@ SkImage* SkImage::newTextureImage(GrContext *context) const { return create_image_from_maker(&maker, at, this->uniqueID()); } +SkImage* SkImage::NewTextureFromPixmap(GrContext* ctx, const SkPixmap& pixmap, + SkBudgeted budgeted) { + if (!ctx) { + return nullptr; + } + SkAutoTUnref<GrTexture> texture(GrUploadPixmapToTexture(ctx, pixmap)); + if (!texture) { + return nullptr; + } + return new SkImage_Gpu(texture->width(), texture->height(), kNeedNewImageUniqueID, + pixmap.alphaType(), texture, budgeted); +} + /////////////////////////////////////////////////////////////////////////////////////////////////// GrTexture* GrDeepCopyTexture(GrTexture* src, SkBudgeted budgeted) { |