commit 0f9f800ea114fc9ea8ed5bf5e8a840986d6f8b62
author Brian Salomon <bsalomon@google.com> Fri Jan 22 16:30:50 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 25 15:00:16 2021 +0000
tree fd18242f200c3b667e4d20aef1f3f5c3ec7fc013
parent 0693fb8e52dfe44143c2f7002c51dbbd06eada00

Add origin back to GrCopyRenderTask

Will be needed for repositionable DDLs.

Change-Id: I6dacf51bd36cfbe1c54a9350987f17a6d18cf3c4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357776
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrCopyRenderTask.cpp

diff --git a/src/gpu/GrCopyRenderTask.cpp b/src/gpu/GrCopyRenderTask.cpp
index 1481ce8..f2887e3 100644
--- a/src/gpu/GrCopyRenderTask.cpp
+++ b/src/gpu/GrCopyRenderTask.cpp
@@ -16,20 +16,25 @@
                                            SkIRect srcRect,
                                            sk_sp<GrSurfaceProxy> dst,
                                            SkIPoint dstPoint,
-                                           const GrCaps* caps) {
+                                           GrSurfaceOrigin origin) {
     SkASSERT(src);
     SkASSERT(dst);
 
-    // Make sure our caller's values are inside the backing surfaces' bounds.
-    SkASSERT(SkIRect::MakeSize(src->backingStoreDimensions()).contains(srcRect));
-    SkASSERT(SkIRect::MakeSize(dst->backingStoreDimensions()).contains(
-             SkIRect::MakePtSize(dstPoint, srcRect.size())));
+    if (!GrClipSrcRectAndDstPoint(dst->dimensions(),
+                                  src->dimensions(),
+                                  srcRect,
+                                  dstPoint,
+                                  &srcRect,
+                                  &dstPoint)) {
+        return nullptr;
+    }
 
     sk_sp<GrCopyRenderTask> task(new GrCopyRenderTask(drawingMgr,
                                                       std::move(src),
                                                       srcRect,
                                                       std::move(dst),
-                                                      dstPoint));
+                                                      dstPoint,
+                                                      origin));
     return std::move(task);
 }
 
@@ -37,8 +42,9 @@
                                    sk_sp<GrSurfaceProxy> src,
                                    SkIRect srcRect,
                                    sk_sp<GrSurfaceProxy> dst,
-                                   SkIPoint dstPoint)
-        : GrRenderTask(), fSrc(std::move(src)), fSrcRect(srcRect), fDstPoint(dstPoint) {
+                                   SkIPoint dstPoint,
+                                   GrSurfaceOrigin origin)
+        : fSrc(std::move(src)), fSrcRect(srcRect), fDstPoint(dstPoint), fOrigin(origin) {
     this->addTarget(drawingMgr, std::move(dst));
 }
 
@@ -53,6 +59,15 @@
     alloc->incOps();
 }
 
+GrRenderTask::ExpectedOutcome GrCopyRenderTask::onMakeClosed(const GrCaps&,
+                                                             SkIRect* targetUpdateBounds) {
+    *targetUpdateBounds = GrNativeRect::MakeIRectRelativeTo(
+            fOrigin,
+            this->target(0)->height(),
+            SkIRect::MakePtSize(fDstPoint, fSrcRect.size()));
+    return ExpectedOutcome::kTargetDirty;
+}
+
 bool GrCopyRenderTask::onExecute(GrOpFlushState* flushState) {
     GrSurfaceProxy* dstProxy = this->target(0);
     if (!fSrc->isInstantiated() || !dstProxy->isInstantiated()) {
@@ -60,6 +75,11 @@
     }
     GrSurface* srcSurface = fSrc->peekSurface();
     GrSurface* dstSurface = dstProxy->peekSurface();
-    return flushState->gpu()->copySurface(dstSurface, srcSurface, fSrcRect, fDstPoint);
+    SkIRect srcRect = GrNativeRect::MakeIRectRelativeTo(fOrigin, srcSurface->height(), fSrcRect);
+    SkIPoint dstPoint = fDstPoint;
+    if (fOrigin == kBottomLeft_GrSurfaceOrigin) {
+        dstPoint.fY = dstSurface->height() - dstPoint.fY - srcRect.height();
+    }
+    return flushState->gpu()->copySurface(dstSurface, srcSurface, srcRect, dstPoint);
 }