Revert "Pass origins through the flushSurfaces calls."
This reverts commit ec3408169b937c66e72957bdeef737fbf96d94fb.
Reason for revert: This change actually isn't needed since a follow on change removes the use of origin from flushSurface anyways
Original change's description:
> 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>
TBR=egdaniel@google.com,robertphillips@google.com
Change-Id: I4ea086d13d0bbef16c59e0abe2c42eb1eb6bf747
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:9556
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270640
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h
index 28201ae..8e78956 100644
--- a/src/gpu/GrContextPriv.h
+++ b/src/gpu/GrContextPriv.h
@@ -86,16 +86,11 @@
* GrContext will detect when it must perform a resolve before reading pixels back from the
* surface or using it as a texture.
*/
- GrSemaphoresSubmitted flushSurfaces(GrSurfaceProxy*[], GrSurfaceOrigin[], int numProxies,
- const GrFlushInfo&);
+ GrSemaphoresSubmitted flushSurfaces(GrSurfaceProxy*[], int numProxies, const GrFlushInfo&);
- /** Version of above that flushes for a single proxy and uses a default GrFlushInfo. Null is not
- * allowed for the proxy. */
- void flushSurface(GrSurfaceProxy*, GrSurfaceOrigin);
-
- void flushSurface() {
- this->flushSurfaces(nullptr, nullptr, 0, {});
- }
+ /** Version of above that flushes for a single proxy and uses a default GrFlushInfo. Null is
+ * allowed. */
+ void flushSurface(GrSurfaceProxy*);
/**
* Returns true if createPMToUPMEffect and createUPMToPMEffect will succeed. In other words,