commit 21bd60daa3f3bc21d69204770e93ff59cbd7281c
author Jim Van Verth <jvanverth@google.com> Fri Oct 12 15:00:20 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 12 19:31:08 2018 +0000
tree 30210368d6bf80a8e57abe6364acc852694fa521
parent 8982a50fc71f32d091f06f62ce6285192de7e5d3

Connect up YUVA images for testing.

* Fixes isTextureBacked() for SkImage_GpuYUVA
* Hooks in SkImage_GpuYUVA::MakePromiseYUVATexture()
* Pass down plane texture sizes to MakePromiseYUVATexture()
* Move some other methods to SkImage_GpuBase.

Bug: skia:7901
Change-Id: I33d62c16b426abba5830f7168f9f8fd54a0cb093
Reviewed-on: https://skia-review.googlesource.com/c/161149
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tools/DDLPromiseImageHelper.cpp

diff --git a/tools/DDLPromiseImageHelper.cpp b/tools/DDLPromiseImageHelper.cpp
index dd97f94..63369cc 100644
--- a/tools/DDLPromiseImageHelper.cpp
+++ b/tools/DDLPromiseImageHelper.cpp
@@ -142,29 +142,29 @@
     if (curImage.isYUV()) {
         GrBackendFormat backendFormats[4];
         void* contexts[4] = { nullptr, nullptr, nullptr, nullptr };
+        SkISize sizes[4];
 
         for (int i = 0; i < 3; ++i) {
             const GrBackendTexture& backendTex = curImage.backendTexture(i);
             backendFormats[i] = caps->createFormatFromBackendTexture(backendTex);
 
             contexts[i] = curImage.refCallbackContext(i).release();
+            sizes[i].set(curImage.yuvPixmap(i).width(), curImage.yuvPixmap(i).height());
         }
 
         SkYUVAIndex yuvaIndices[4] = {
                 SkYUVAIndex{0, SkColorChannel::kA},
                 SkYUVAIndex{1, SkColorChannel::kA},
                 SkYUVAIndex{2, SkColorChannel::kA},
-                SkYUVAIndex{-1, SkColorChannel::kA}
+                SkYUVAIndex{-1, SkColorChannel::kA}  // TODO: enable this
         };
 
-        int tempWidth = curImage.backendTexture(0).width();
-        int tempHeight = curImage.backendTexture(0).height();
-
         image = recorder->makeYUVAPromiseTexture(curImage.yuvColorSpace(),
                                                  backendFormats,
+                                                 sizes,
                                                  yuvaIndices,
-                                                 tempWidth,  //curImage.overallWidth(),
-                                                 tempHeight, //curImage.overallHeight(),
+                                                 curImage.overallWidth(),
+                                                 curImage.overallHeight(),
                                                  GrSurfaceOrigin::kTopLeft_GrSurfaceOrigin,
                                                  curImage.refOverallColorSpace(),
                                                  DDLPromiseImageHelper::PromiseImageFulfillProc,