diff options
author | Brian Salomon <bsalomon@google.com> | 2018-03-19 16:29:37 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-22 19:12:50 +0000 |
commit | 3afdab1884c3346a9fb7195609927cd8fd1553c7 (patch) | |
tree | 57804dc944be3d054efb7e655c8335ebfdd9210d /src | |
parent | 0fd12755e9a9c6e6ff8d19d97bb8c62e554319e2 (diff) |
Always validate GrBackendTextures passed to YUV image factories
Change-Id: I73a301fcdf13fceb82c94b0c68ac9386aa38e16d
Reviewed-on: https://skia-review.googlesource.com/115126
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/image/SkImage_Gpu.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index e2b461f801..4733cae06e 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -377,12 +377,9 @@ sk_sp<SkImage> SkImage_Gpu::MakeFromYUVTexturesCopyImpl( }; auto ct = nv12 ? kRGBA_8888_SkColorType : kAlpha_8_SkColorType; for (int i = 0; i < (nv12 ? 2 : 3); ++i) { - if (yuvBackendTextures[i].fConfig == kUnknown_GrPixelConfig) { - if (!validate_backend_texture(ctx, yuvBackendTextures[i], - &yuvBackendTextures[i].fConfig, ct, kPremul_SkAlphaType, - nullptr)) { - return nullptr; - } + if (!validate_backend_texture(ctx, yuvBackendTextures[i], &yuvBackendTextures[i].fConfig, + ct, kPremul_SkAlphaType, nullptr)) { + return nullptr; } } sk_sp<GrTextureProxy> yProxy = proxyProvider->wrapBackendTexture(yuvBackendTextures[0], origin); |