From d316e77c1e1967b439a9a6c11146c54e367bff71 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 14 Dec 2016 12:04:46 +0000 Subject: Revert "Add a deferred copy surface (take 2)" This reverts commit 398487a850431cf495330d4023607df5305a311f. Reason for revert: See if this is causing the roll failure Original change's description: > Add a deferred copy surface (take 2) > > This CL forces all GrSurface copies to go through a GrSurfaceContext (rather than GrContext). > > There is a bit of goofiness going on here until read/writePixels is also consolidated in GrSurfaceContext and a proxy-backed SkImage/SkSurface is added. > > This is a reland of https://skia-review.googlesource.com/c/5773/ (Add a deferred copy surface) > > Change-Id: Ide560f569aede5e622420dc2f30eef76357d69f4 > Reviewed-on: https://skia-review.googlesource.com/5939 > Reviewed-by: Brian Osman > Reviewed-by: Brian Salomon > Commit-Queue: Robert Phillips > TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I1ef40f0d5fb0bca62031f94f10eb18acd753e913 Reviewed-on: https://skia-review.googlesource.com/6024 Commit-Queue: Robert Phillips Reviewed-by: Robert Phillips --- include/gpu/GrTextureContext.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include/gpu/GrTextureContext.h') diff --git a/include/gpu/GrTextureContext.h b/include/gpu/GrTextureContext.h index 3052f0ccb5..da71c07c72 100644 --- a/include/gpu/GrTextureContext.h +++ b/include/gpu/GrTextureContext.h @@ -27,7 +27,7 @@ class SK_API GrTextureContext : public GrSurfaceContext { public: ~GrTextureContext() override; - GrSurfaceProxy* asDeferredSurface() override { return fTextureProxy.get(); } + bool copySurface(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint) override; protected: GrTextureContext(GrContext*, GrDrawingManager*, sk_sp, GrAuditTrail*, @@ -40,8 +40,6 @@ protected: private: friend class GrDrawingManager; // for ctor - bool onCopy(GrSurfaceProxy* src, const SkIRect& srcRect, const SkIPoint& dstPoint) override; - GrTextureOpList* getOpList(); GrDrawingManager* fDrawingManager; @@ -50,8 +48,6 @@ private: // In MDB-mode the GrOpList can be closed by some other renderTargetContext that has picked // it up. For this reason, the GrOpList should only ever be accessed via 'getOpList'. GrTextureOpList* fOpList; - - typedef GrSurfaceContext INHERITED; }; #endif -- cgit v1.2.3