commit af6cf631afada142ce57190e413fda31f563ee68
author Stephen White <senorblanco@chromium.org> Fri Jun 05 16:19:45 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 05 21:17:16 2020 +0000
tree 281dc42cfa6824caedbeb471e48e8fb1f76e958e
parent a4ae8d0375cf719b4495b11df20b30820a41b907

Revert my recent change to WritePixelsNonTexture_Gpu.

This check isn't correct, since most backends will use a fallback path if
writePixels directly to a surface fails.

That fallback path doesn't work for Dawn currently, so skip the test
on the Dawn backend.

Change-Id: I07f9a25640bc579d6b0952e208237368d007b06d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294702
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>

tests/WritePixelsTest.cpp

diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index 5648c40..e212f445 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -10,7 +10,6 @@
 #include "include/private/SkColorData.h"
 #include "include/private/SkImageInfoPriv.h"
 #include "src/core/SkMathPriv.h"
-#include "src/image/SkSurface_Gpu.h"
 #include "tests/Test.h"
 #include "tests/TestUtils.h"
 #include "tools/ToolUtils.h"
@@ -20,8 +19,6 @@
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrProxyProvider.h"
-#include "src/gpu/GrRenderTarget.h"
-#include "src/gpu/SkGpuDevice.h"
 
 #include <initializer_list>
 
@@ -454,21 +451,14 @@
     test_write_pixels(reporter, ctxInfo.grContext(), 1);
 }
 
-
-static bool render_target_supports_write_pixels(const GrCaps* caps, SkSurface* surface) {
-    auto surfaceGpu = static_cast<SkSurface_Gpu*>(surface);
-    GrRenderTargetContext* context = surfaceGpu->getDevice()->accessRenderTargetContext();
-    GrRenderTarget* rt = context->accessRenderTarget();
-    if (!rt) {
-        return false;
-    }
-    return caps->surfaceSupportsWritePixels(rt);
-}
-
 static void test_write_pixels_non_texture(skiatest::Reporter* reporter,
                                           GrContext* context,
                                           int sampleCnt) {
-
+    // Dawn currently doesn't support writePixels to a texture-as-render-target.
+    // See http://skbug.com/10336.
+    if (GrBackendApi::kDawn == context->backend()) {
+        return;
+    }
     for (auto& origin : { kTopLeft_GrSurfaceOrigin, kBottomLeft_GrSurfaceOrigin }) {
         GrBackendTexture backendTex;
         CreateBackendTexture(context, &backendTex, DEV_W, DEV_H, kRGBA_8888_SkColorType,
@@ -479,7 +469,7 @@
         SkColorType colorType = kN32_SkColorType;
         sk_sp<SkSurface> surface(SkSurface::MakeFromBackendTextureAsRenderTarget(
                 context, backendTex, origin, sampleCnt, colorType, nullptr, nullptr));
-        if (surface && render_target_supports_write_pixels(context->priv().caps(), surface.get())) {
+        if (surface) {
             auto ii = SkImageInfo::MakeN32Premul(DEV_W, DEV_H);
             test_write_pixels(reporter, surface.get(), ii);
         }