diff options
-rw-r--r-- | docs/SkImage_Reference.bmh | 10 | ||||
-rw-r--r-- | include/core/SkImage.h | 8 | ||||
-rw-r--r-- | src/image/SkImage.cpp | 6 | ||||
-rw-r--r-- | src/image/SkImage_Gpu.cpp | 16 |
4 files changed, 5 insertions, 35 deletions
diff --git a/docs/SkImage_Reference.bmh b/docs/SkImage_Reference.bmh index ded4c91dd8..781ad71c1d 100644 --- a/docs/SkImage_Reference.bmh +++ b/docs/SkImage_Reference.bmh @@ -562,16 +562,6 @@ if (source.peekPixels(&pixmap)) { #Method static sk_sp<SkImage> MakeFromAdoptedTexture(GrContext* context, const GrBackendTexture& backendTexture, GrSurfaceOrigin surfaceOrigin, - SkAlphaType alphaType = kPremul_SkAlphaType, - sk_sp<SkColorSpace> colorSpace = nullptr) -#Deprecated -#Method ## - -# ------------------------------------------------------------------------------ - -#Method static sk_sp<SkImage> MakeFromAdoptedTexture(GrContext* context, - const GrBackendTexture& backendTexture, - GrSurfaceOrigin surfaceOrigin, SkColorType colorType, SkAlphaType alphaType = kPremul_SkAlphaType, sk_sp<SkColorSpace> colorSpace = nullptr) diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 06cb190007..17d2564914 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -272,14 +272,6 @@ public: static sk_sp<SkImage> MakeCrossContextFromPixmap(GrContext* context, const SkPixmap& pixmap, bool buildMips, SkColorSpace* dstColorSpace); - /** Deprecated. - */ - static sk_sp<SkImage> MakeFromAdoptedTexture(GrContext* context, - const GrBackendTexture& backendTexture, - GrSurfaceOrigin surfaceOrigin, - SkAlphaType alphaType = kPremul_SkAlphaType, - sk_sp<SkColorSpace> colorSpace = nullptr); - /** Creates SkImage from backendTexture associated with context. backendTexture and returned SkImage are managed internally, and are released when no longer needed. diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 126470ec4b..40daa6fbc3 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -363,12 +363,6 @@ bool SkImage::MakeBackendTextureFromSkImage(GrContext*, sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, const GrBackendTexture& tex, GrSurfaceOrigin origin, - SkAlphaType at, sk_sp<SkColorSpace> cs) { - return nullptr; -} - -sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, - const GrBackendTexture& tex, GrSurfaceOrigin origin, SkColorType ct, SkAlphaType at, sk_sp<SkColorSpace> cs) { return nullptr; diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 6342512837..e2b461f801 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -350,24 +350,18 @@ sk_sp<SkImage> SkImage::MakeFromTexture(GrContext* ctx, sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, const GrBackendTexture& tex, GrSurfaceOrigin origin, - SkAlphaType at, sk_sp<SkColorSpace> cs) { - if (!ctx->contextPriv().resourceProvider()) { + SkColorType ct, SkAlphaType at, + sk_sp<SkColorSpace> cs) { + if (!ctx || !ctx->contextPriv().resourceProvider()) { // We have a DDL context and we don't support adopted textures for them. return nullptr; } - return new_wrapped_texture_common(ctx, tex, origin, at, std::move(cs), kAdopt_GrWrapOwnership, - nullptr, nullptr); -} - -sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, - const GrBackendTexture& tex, GrSurfaceOrigin origin, - SkColorType ct, SkAlphaType at, - sk_sp<SkColorSpace> cs) { GrBackendTexture texCopy = tex; if (!validate_backend_texture(ctx, texCopy, &texCopy.fConfig, ct, at, cs)) { return nullptr; } - return MakeFromAdoptedTexture(ctx, texCopy, origin, at, cs); + return new_wrapped_texture_common(ctx, texCopy, origin, at, std::move(cs), + kAdopt_GrWrapOwnership, nullptr, nullptr); } sk_sp<SkImage> SkImage_Gpu::MakeFromYUVTexturesCopyImpl( |