commit 75ee737770756be94cb914de2665b93bac36948f
author Brian Salomon <bsalomon@google.com> Tue Apr 06 15:04:35 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 07 13:33:28 2021 +0000
tree 778e76c51e835eb04c0d557c358ec8f1fd64dbb7
parent 2bec8ab55b5b4e51a0a8fcaabf7ef95c4167b216

remove prepForSampling from GrSurfaceContext::writePixels.

We believe with advent of  GrBackendSurfaceMutableState that this is
only needed for inline atlas uploads. Those call GrGpu directly.

Bug: 1191058
Change-Id: Iad851ebc9f5b7df21d16064a84caa9575da98634
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/393082
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrSurfaceContext.cpp

diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index f98b377..bea7206 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -357,8 +357,7 @@
 
 bool GrSurfaceContext::writePixels(GrDirectContext* dContext,
                                    GrCPixmap src,
-                                   SkIPoint dstPt,
-                                   bool prepForSampling) {
+                                   SkIPoint dstPt) {
     ASSERT_SINGLE_OWNER
     RETURN_FALSE_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
@@ -370,13 +369,12 @@
     if (!src.info().bpp() || src.rowBytes() % src.info().bpp()) {
         return false;
     }
-    return this->internalWritePixels(dContext, &src, 1, dstPt, prepForSampling);
+    return this->internalWritePixels(dContext, &src, 1, dstPt);
 }
 
 bool GrSurfaceContext::writePixels(GrDirectContext* dContext,
                                    const GrCPixmap src[],
-                                   int numLevels,
-                                   bool prepForSampling) {
+                                   int numLevels) {
     ASSERT_SINGLE_OWNER
     RETURN_FALSE_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
@@ -389,7 +387,7 @@
         if (src->dimensions() != this->dimensions()) {
             return false;
         }
-        return this->writePixels(dContext, src[0], {0, 0}, prepForSampling);
+        return this->writePixels(dContext, src[0], {0, 0});
     }
     if (!this->asTextureProxy() || this->asTextureProxy()->proxyMipmapped() == GrMipmapped::kNo) {
         return false;
@@ -411,14 +409,13 @@
         }
         dims = {std::max(1, dims.width()/2), std::max(1, dims.height()/2)};
     }
-    return this->internalWritePixels(dContext, src, numLevels, {0, 0}, prepForSampling);
+    return this->internalWritePixels(dContext, src, numLevels, {0, 0});
 }
 
 bool GrSurfaceContext::internalWritePixels(GrDirectContext* dContext,
                                            const GrCPixmap src[],
                                            int numLevels,
-                                           SkIPoint pt,
-                                           bool prepForSampling) {
+                                           SkIPoint pt) {
     GR_AUDIT_TRAIL_AUTO_FRAME(this->auditTrail(), "GrSurfaceContext::internalWritePixels");
 
     SkASSERT(numLevels >= 1);
@@ -484,9 +481,7 @@
                             dContext->priv().validPMUPMConversionExists();
     // Drawing code path doesn't support writing to levels and doesn't support inserting layout
     // transitions.
-    if ((!caps->surfaceSupportsWritePixels(dstSurface) || canvas2DFastPath) &&
-        numLevels == 1 &&
-        !prepForSampling) {
+    if ((!caps->surfaceSupportsWritePixels(dstSurface) || canvas2DFastPath) && numLevels == 1) {
         GrColorInfo tempColorInfo;
         GrBackendFormat format;
         GrSwizzle tempReadSwizzle;
@@ -620,8 +615,7 @@
                 allowedColorType,
                 this->colorInfo().colorType(),
                 srcLevels.begin(),
-                numLevels,
-                prepForSampling)) {
+                numLevels)) {
         return false;
     }
     if (numLevels > 1) {