commit ec3408169b937c66e72957bdeef737fbf96d94fb
author Greg Daniel <egdaniel@google.com> Wed Feb 12 15:27:49 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 13 15:34:22 2020 +0000
tree da7191f570f410a8e1cbaa9bdea4f72734faa616
parent 7c81245a1834aac94db39380ffe2a3cd647246a7

Pass origins through the flushSurfaces calls.

Bug: skia:9556
Change-Id: Ie4a0b33dd35e50b93c30cb0010f60c2893140661
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270439
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 68f57f1..961c603 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -494,7 +494,8 @@
     return anyRenderTasksExecuted;
 }
 
-GrSemaphoresSubmitted GrDrawingManager::flushSurfaces(GrSurfaceProxy* proxies[], int numProxies,
+GrSemaphoresSubmitted GrDrawingManager::flushSurfaces(GrSurfaceProxy* proxies[],
+                                                      GrSurfaceOrigin origins[], int numProxies,
                                                       SkSurface::BackendSurfaceAccess access,
                                                       const GrFlushInfo& info) {
     if (this->wasAbandoned()) {
@@ -534,7 +535,7 @@
             if (rtProxy->isMSAADirty()) {
                 SkASSERT(rtProxy->peekRenderTarget());
                 gpu->resolveRenderTarget(rtProxy->peekRenderTarget(), rtProxy->msaaDirtyRect(),
-                                         rtProxy->origin(), GrGpu::ForExternalIO::kYes);
+                                         origins[i], GrGpu::ForExternalIO::kYes);
                 rtProxy->markMSAAResolved();
             }
         }