commit 9bf8120cabd6f99dce3ac698fc019322e2d164c7
author Jim Van Verth <jvanverth@google.com> Tue Oct 30 15:53:36 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 30 21:11:54 2018 +0000
tree 21174f1e7bb2d9b80c5b4e858646147381fb7021
parent 4c169456061daf50379cb6990c215bd332c885c6

More YUV cleanup

* Remove more uses of colortype
* Add back SkImage_GpuYUVA::MakeFromYUVATextures

Bug: skia:7903
Change-Id: I3ee119d190db39c128516dbb78db34fe29ba3cce
Reviewed-on: https://skia-review.googlesource.com/c/165943
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

gm/wacky_yuv_formats.cpp

diff --git a/gm/wacky_yuv_formats.cpp b/gm/wacky_yuv_formats.cpp
index d1c65f9..8ea25c0 100644
--- a/gm/wacky_yuv_formats.cpp
+++ b/gm/wacky_yuv_formats.cpp
@@ -18,6 +18,7 @@
 #include "GrBackendSurface.h"
 #include "GrContextPriv.h"
 #include "GrGpu.h"
+#include "SkImage_GpuYUVA.h"
 #endif
 
 static const int kTileWidthHeight = 128;
@@ -712,6 +713,7 @@
     }
 
     void createImages(GrContext* context) {
+        int counter = 0;
         for (bool opaque : { false, true }) {
             for (int cs = kJPEG_SkYUVColorSpace; cs <= kLastEnum_SkYUVColorSpace; ++cs) {
                 PlaneData planes;
@@ -722,7 +724,6 @@
                     SkYUVAIndex yuvaIndices[4];
                     create_YUV(planes, (YUVFormat) format, resultBMs, yuvaIndices, opaque);
 
-#if SK_SUPPORT_GPU
                     if (context) {
                         if (context->abandoned()) {
                             return;
@@ -758,16 +759,24 @@
                                 resultBMs[i].rowBytes());
                         }
 
-                        fImages[opaque][cs][format] = SkImage::MakeFromYUVATexturesCopy(
-                            context,
-                            (SkYUVColorSpace) cs,
-                            yuvaTextures,
-                            yuvaIndices,
-                            { fOriginalBMs[opaque].width(), fOriginalBMs[opaque].height() },
-                            kTopLeft_GrSurfaceOrigin);
-                    } else
-#endif
-                    {
+                        if (counter & 0x1) {
+                            fImages[opaque][cs][format] = SkImage::MakeFromYUVATexturesCopy(
+                                context,
+                                (SkYUVColorSpace)cs,
+                                yuvaTextures,
+                                yuvaIndices,
+                                { fOriginalBMs[opaque].width(), fOriginalBMs[opaque].height() },
+                                kTopLeft_GrSurfaceOrigin);
+                        } else {
+                            fImages[opaque][cs][format] = SkImage::MakeFromYUVATextures(
+                                context,
+                                (SkYUVColorSpace)cs,
+                                yuvaTextures,
+                                yuvaIndices,
+                                { fOriginalBMs[opaque].width(), fOriginalBMs[opaque].height() },
+                                kTopLeft_GrSurfaceOrigin);
+                        }
+                    } else {
                         fImages[opaque][cs][format] = make_yuv_gen_image(
                                                                 fOriginalBMs[opaque].info(),
                                                                 (SkYUVColorSpace) cs,
@@ -776,6 +785,7 @@
                     }
                 }
             }
+            ++counter;
         }
     }