Revert "Add a deferred copy surface (take 2)"
authorRobert Phillips <robertphillips@google.com>
Wed, 14 Dec 2016 12:04:46 +0000 (12:04 +0000)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Wed, 14 Dec 2016 12:05:06 +0000 (12:05 +0000)
commitd316e77c1e1967b439a9a6c11146c54e367bff71
treefbf7d3740c39507cdb2aad0267c2d96cd3d98bec
parent2e018f548d76b0688f9873c683cffc681fec40ec
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 <brianosman@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>

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 <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
23 files changed:
gm/image_pict.cpp
include/gpu/GrContext.h
include/gpu/GrRenderTargetContext.h
include/gpu/GrSurfaceContext.h
include/gpu/GrTextureContext.h
include/private/GrRenderTargetProxy.h
include/private/GrSurfaceProxy.h
src/core/SkSpecialImage.cpp
src/gpu/GrContext.cpp
src/gpu/GrContextPriv.h
src/gpu/GrRenderTargetContext.cpp
src/gpu/GrRenderTargetContextPriv.h
src/gpu/GrRenderTargetProxy.cpp
src/gpu/GrSurfaceProxy.cpp
src/gpu/GrTextureContext.cpp
src/gpu/SkGpuDevice.cpp
src/image/SkImage_Gpu.cpp
src/image/SkSurface_Gpu.cpp
tests/CopySurfaceTest.cpp
tests/EGLImageTest.cpp
tests/GrTextureStripAtlasTest.cpp
tests/IntTextureTest.cpp
tests/RectangleTextureTest.cpp