diff options
| -rw-r--r-- | docs/SkImage_Reference.bmh | 23 | ||||
| -rw-r--r-- | include/core/SkImage.h | 21 | ||||
| -rw-r--r-- | src/image/SkImage.cpp | 2 | ||||
| -rw-r--r-- | src/image/SkImage_Gpu.cpp | 14 |
4 files changed, 3 insertions, 57 deletions
diff --git a/docs/SkImage_Reference.bmh b/docs/SkImage_Reference.bmh index 893eb8571b..41bd2d6aa1 100644 --- a/docs/SkImage_Reference.bmh +++ b/docs/SkImage_Reference.bmh @@ -355,29 +355,6 @@ for (int quality : { 100, 50, 10, 1} ) { #Method static sk_sp<SkImage> MakeFromTexture(GrContext* context, const GrBackendTexture& backendTexture, GrSurfaceOrigin origin, - SkAlphaType alphaType, - sk_sp<SkColorSpace> colorSpace) -#Deprecated -#Method ## - -# ------------------------------------------------------------------------------ - -#Method static sk_sp<SkImage> MakeFromTexture(GrContext* context, - const GrBackendTexture& backendTexture, - GrSurfaceOrigin origin, - SkAlphaType alphaType, - sk_sp<SkColorSpace> colorSpace, - TextureReleaseProc textureReleaseProc, - ReleaseContext releaseContext) - -#Deprecated -#Method ## - -# ------------------------------------------------------------------------------ - -#Method static sk_sp<SkImage> MakeFromTexture(GrContext* context, - const GrBackendTexture& backendTexture, - GrSurfaceOrigin origin, SkColorType colorType, SkAlphaType alphaType, sk_sp<SkColorSpace> colorSpace) diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 7c865f7633..06cb190007 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -160,27 +160,6 @@ public: typedef void (*TextureReleaseProc)(ReleaseContext releaseContext); - /** Deprecated. - */ - static sk_sp<SkImage> MakeFromTexture(GrContext* context, - const GrBackendTexture& backendTexture, - GrSurfaceOrigin origin, - SkAlphaType alphaType, - sk_sp<SkColorSpace> colorSpace) { - return MakeFromTexture(context, backendTexture, origin, alphaType, colorSpace, nullptr, - nullptr); - } - - /** Deprecated. - */ - static sk_sp<SkImage> MakeFromTexture(GrContext* context, - const GrBackendTexture& backendTexture, - GrSurfaceOrigin origin, - SkAlphaType alphaType, - sk_sp<SkColorSpace> colorSpace, - TextureReleaseProc textureReleaseProc, - ReleaseContext releaseContext); - /** Creates SkImage from GPU texture associated with context. Caller is responsible for managing the lifetime of GPU texture. diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 0373398644..126470ec4b 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -349,7 +349,7 @@ sk_sp<SkImage> SkImage::makeRasterImage() const { sk_sp<SkImage> SkImage::MakeFromTexture(GrContext* ctx, const GrBackendTexture& tex, GrSurfaceOrigin origin, - SkAlphaType at, sk_sp<SkColorSpace> cs, + SkColorType ct, SkAlphaType at, sk_sp<SkColorSpace> cs, TextureReleaseProc releaseP, ReleaseContext releaseC) { return nullptr; } diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 291b979b7b..9c62c349c8 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -320,17 +320,6 @@ static sk_sp<SkImage> new_wrapped_texture_common(GrContext* ctx, at, std::move(proxy), std::move(colorSpace), SkBudgeted::kNo); } -sk_sp<SkImage> SkImage::MakeFromTexture(GrContext* ctx, - const GrBackendTexture& tex, GrSurfaceOrigin origin, - SkAlphaType at, sk_sp<SkColorSpace> cs, - TextureReleaseProc releaseP, ReleaseContext releaseC) { - if (!ctx) { - return nullptr; - } - return new_wrapped_texture_common(ctx, tex, origin, at, std::move(cs), kBorrow_GrWrapOwnership, - releaseP, releaseC); -} - bool validate_backend_texture(GrContext* ctx, const GrBackendTexture& tex, GrPixelConfig* config, SkColorType ct, SkAlphaType at, sk_sp<SkColorSpace> cs) { // TODO: Create a SkImageColorInfo struct for color, alpha, and color space so we don't need to @@ -354,7 +343,8 @@ sk_sp<SkImage> SkImage::MakeFromTexture(GrContext* ctx, if (!validate_backend_texture(ctx, texCopy, &texCopy.fConfig, ct, at, cs)) { return nullptr; } - return MakeFromTexture(ctx, texCopy, origin, at, cs, releaseP, releaseC); + return new_wrapped_texture_common(ctx, texCopy, origin, at, std::move(cs), + kBorrow_GrWrapOwnership, releaseP, releaseC); } sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, |