commit 5327536d178240cd7b0c27abd6bbdcb682b16afc
author Jim Van Verth <jvanverth@google.com> Fri Nov 09 15:42:35 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 09 21:37:34 2018 +0000
tree 0fd30f3755e6b974f60b1fc7e7d6e0f3cc35e0b8
parent 777eede7800ea060c94ce7e4a426769eda15ca2d

Verify YUVA channel information and add premultiplied alpha

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

src/image/SkImage_GpuBase.cpp

diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp
index 332e725..8360361 100644
--- a/src/image/SkImage_GpuBase.cpp
+++ b/src/image/SkImage_GpuBase.cpp
@@ -291,7 +291,8 @@
 }
 
 bool SkImage_GpuBase::MakeTempTextureProxies(GrContext* ctx, const GrBackendTexture yuvaTextures[],
-                                             int numTextures, GrSurfaceOrigin imageOrigin,
+                                             int numTextures, const SkYUVAIndex yuvaIndices[4],
+                                             GrSurfaceOrigin imageOrigin,
                                              sk_sp<GrTextureProxy> tempTextureProxies[4]) {
     GrProxyProvider* proxyProvider = ctx->contextPriv().proxyProvider();
 
@@ -312,6 +313,33 @@
         if (!tempTextureProxies[textureIndex]) {
             return false;
         }
+
+        // Check that each texture contains the channel data for the corresponding YUVA index
+        GrPixelConfig config = yuvaTexturesCopy[textureIndex].fConfig;
+        for (int yuvaIndex = 0; yuvaIndex < SkYUVAIndex::kIndexCount; ++yuvaIndex) {
+            if (yuvaIndices[yuvaIndex].fIndex == textureIndex) {
+                switch (yuvaIndices[yuvaIndex].fChannel) {
+                    case SkColorChannel::kR:
+                        if (kAlpha_8_as_Alpha_GrPixelConfig == config) {
+                            return false;
+                        }
+                        break;
+                    case SkColorChannel::kG:
+                    case SkColorChannel::kB:
+                        if (kAlpha_8_as_Alpha_GrPixelConfig == config ||
+                            kAlpha_8_as_Red_GrPixelConfig == config) {
+                            return false;
+                        }
+                        break;
+                    case SkColorChannel::kA:
+                    default:
+                        if (kRGB_888_GrPixelConfig == config) {
+                            return false;
+                        }
+                        break;
+                }
+            }
+        }
     }
 
     return true;
@@ -329,8 +357,6 @@
     GrPaint paint;
     paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
 
-    // TODO: modify the YUVtoRGBEffect to do premul if needed
-    // (e.g., if SkImage_GpuYUVA::fImageAlphaType is kPremul_AlphaType)
     paint.addColorFragmentProcessor(GrYUVtoRGBEffect::Make(proxies, yuvaIndices,
                                                            yuvColorSpace,
                                                            GrSamplerState::Filter::kNearest));