commit 729fc0cb65f72bfd70ff9f09a404d2d5da8716f2
author Brian Salomon <bsalomon@google.com> Mon Sep 30 16:33:11 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 30 16:33:19 2019 +0000
tree acdb65b0954656f76893767c6260755cecda6fae
parent 35048fab8adb001547d5e9aa8b475b58e5ece96f

Revert "Construct GPU SkImages with SkColorType, don't infer from GrPixelConfig"

This reverts commit 384f6e35b1a9716f58e584498749c40f23fe6690.

Reason for revert: bot breakage

Original change's description:
> Construct GPU SkImages with SkColorType, don't infer from GrPixelConfig
> 
> Bug: skia:6718
> 
> Change-Id: I8828939427481ea7780a66fc0fed8e9909baba9b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245156
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com

Change-Id: Ib52b457bfc4b323ce06ee5359d9e9ab580aff6ea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6718
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245166
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

gm/flippity.cpp

diff --git a/gm/flippity.cpp b/gm/flippity.cpp
index ca0ca42..c9e4f19 100644
--- a/gm/flippity.cpp
+++ b/gm/flippity.cpp
@@ -137,8 +137,8 @@
         return nullptr;
     }
 
-    return sk_make_sp<SkImage_Gpu>(sk_ref_sp(context), kNeedNewImageUniqueID, bm.colorType(),
-                                   bm.alphaType(), bm.refColorSpace(), std::move(proxy));
+    return sk_make_sp<SkImage_Gpu>(sk_ref_sp(context), kNeedNewImageUniqueID, kOpaque_SkAlphaType,
+                                   std::move(proxy), nullptr);
 }
 
 // Here we're converting from a matrix that is intended for UVs to a matrix that is intended

gm/image_pict.cpp

diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
index c3ab85f..f916ca7 100644
--- a/gm/image_pict.cpp
+++ b/gm/image_pict.cpp
@@ -268,8 +268,9 @@
     }
 
     static void draw_as_tex(SkCanvas* canvas, SkImage* image, SkScalar x, SkScalar y) {
-        auto texImage = image->makeTextureImage(canvas->getGrContext());
-        if (!texImage) {
+        sk_sp<GrTextureProxy> proxy(as_IB(image)->asTextureProxyRef(
+                canvas->getGrContext(), GrSamplerState::ClampBilerp(), nullptr));
+        if (!proxy) {
             // show placeholder if we have no texture
             SkPaint paint;
             paint.setStyle(SkPaint::kStroke_Style);
@@ -280,6 +281,11 @@
             canvas->drawLine(r.left(), r.bottom(), r.right(), r.top(), paint);
             return;
         }
+
+        // No API to draw a GrTexture directly, so we cheat and create a private image subclass
+        sk_sp<SkImage> texImage(new SkImage_Gpu(sk_ref_sp(canvas->getGrContext()),
+                                                image->uniqueID(), kPremul_SkAlphaType,
+                                                std::move(proxy), image->refColorSpace()));
         canvas->drawImage(texImage.get(), x, y);
     }