Refactor GrCaps::renderTargetWritePixelsSupported to support for some GL workarounds

Make indirect path in writeSurfacePixels2 use a copy rather than a draw.

Fix issue in GrVkGpu where render target dirty region is not updated after copy-as-draw

Remove unnecessary resolve of MSAA RT in GrVkCopyManager.

Splits WritePixelsNonTexture_Gpu test into MSAA and non-MSAA variants. MSAA variant blacklisted
on Adreno because of:

Bug: skia:7663

~~~~~~AND~~~~~~~

Revert "Suppress CopySurface test on Nexus 7"

This reverts commit b42b6169d52408a1712c2740655300465cd6ff1e.

Bug: skia:7658
Change-Id: I8337d718efb41e266537744bbf5ff8b1545322a7
Reviewed-on: https://skia-review.googlesource.com/110700
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

2 files changed, 5 insertions, 8 deletions

diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h
index de9bc73cf5..2e01cd9fed 100644
--- a/include/gpu/GrCaps.h
+++ b/include/gpu/GrCaps.h
@@ -20,6 +20,7 @@ class GrBackendRenderTarget;
 class GrBackendTexture;
 struct GrContextOptions;
 class GrRenderTargetProxy;
+class GrSurface;
 class SkJSONWriter;
 
 /**
@@ -186,12 +187,11 @@ public:
     }
 
     /**
-     * Some backends have restrictions on what types of render targets for which
-     * GrGpu::writePixels() will succeed. If this returns false then the caller should implement a
-     * fallback where a temporary texture is created, pixels are written to it, and then that is
-     * copied or drawn into the the render target.
+     * Backends may have restrictions on what types of surfaces support GrGpu::writePixels().
+     * If this returns false then the caller should implement a fallback where a temporary texture
+     * is created, pixels are written to it, and then that is copied or drawn into the the surface.
      */
-    virtual bool renderTargetWritePixelsSupported(bool isAlsoTexture, int sampleCnt) const = 0;
+    virtual bool surfaceSupportsWritePixels(const GrSurface* surface) const = 0;
 
     /**
      * Given a dst pixel config and a src color type what color type must the caller coax the
diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h
index 84863f50a6..74ec7feb1f 100644
--- a/include/gpu/GrContextOptions.h
+++ b/include/gpu/GrContextOptions.h
@@ -70,9 +70,6 @@ struct GrContextOptions {
      */
     SkExecutor* fExecutor = nullptr;
 
-    /** some gpus have problems with partial writes of the rendertarget */
-    bool fUseDrawInsteadOfPartialRenderTargetWrite = false;
-
     /** Construct mipmaps manually, via repeated downsampling draw-calls. This is used when
         the driver's implementation (glGenerateMipmap) contains bugs. This requires mipmap
         level and LOD control (ie desktop or ES3). */