commit 7da4676e99b6538c6a1ec19ba704eb1d2403eff7
author Jim Van Verth <jvanverth@google.com> Mon Nov 05 14:24:23 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 05 20:00:24 2018 +0000
tree 6854dbade31ff1065e80079e2751c22afeb83377
parent 46f21ffa7c71b15eccafb1977c6283681e4e6e4f

Temporarily disable support of mipmapped flattened YUVA image

Bug:
Change-Id: Ifea233b68c2e4c41abe68cf7654054da02d12d38
Reviewed-on: https://skia-review.googlesource.com/c/168273
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/gpu/GrImageTextureMaker.cpp

diff --git a/src/gpu/GrImageTextureMaker.cpp b/src/gpu/GrImageTextureMaker.cpp
index cf74545..70cbe64 100644
--- a/src/gpu/GrImageTextureMaker.cpp
+++ b/src/gpu/GrImageTextureMaker.cpp
@@ -54,7 +54,16 @@
 
 sk_sp<GrTextureProxy> GrYUVAImageTextureMaker::refOriginalTextureProxy(bool willBeMipped,
                                                                    AllowedTexGenType onlyIfFast) {
-    return (AllowedTexGenType::kCheap == onlyIfFast) ? nullptr : fImage->asTextureProxyRef();
+    if (AllowedTexGenType::kCheap == onlyIfFast) {
+        return nullptr;
+    }
+
+    auto proxy = fImage->asTextureProxyRef();
+    if (willBeMipped && proxy && GrMipMapped::kNo == proxy->mipMapped()) {
+        return nullptr;
+    }
+
+    return proxy;
 }
 
 void GrYUVAImageTextureMaker::makeCopyKey(const CopyParams& stretch, GrUniqueKey* paramsCopyKey) {