From 398487a850431cf495330d4023607df5305a311f Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 13 Dec 2016 15:29:42 -0500 Subject: 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 --- tests/EGLImageTest.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tests/EGLImageTest.cpp') diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index f78a0ea02a..0dcacf9b6b 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp @@ -10,6 +10,7 @@ #include "GrContext.h" #include "GrContextFactory.h" #include "GrShaderCaps.h" +#include "GrSurfaceContext.h" #include "gl/GrGLGpu.h" #include "gl/GrGLUtil.h" #include "gl/GLTestContext.h" @@ -40,7 +41,7 @@ static void cleanup(GLTestContext* glctx0, GrGLuint texID0, GLTestContext* glctx } static void test_read_pixels(skiatest::Reporter* reporter, GrContext* context, - GrTexture* externalTexture, uint32_t expectedPixelValues[]) { + GrSurface* externalTexture, uint32_t expectedPixelValues[]) { int pixelCnt = externalTexture->width() * externalTexture->height(); SkAutoTMalloc pixels(pixelCnt); memset(pixels.get(), 0, sizeof(uint32_t)*pixelCnt); @@ -76,9 +77,13 @@ static void test_copy_surface(skiatest::Reporter* reporter, GrContext* context, copyDesc.fWidth = externalTexture->width(); copyDesc.fHeight = externalTexture->height(); copyDesc.fFlags = kRenderTarget_GrSurfaceFlag; - sk_sp copy(context->textureProvider()->createTexture(copyDesc, SkBudgeted::kYes)); - context->copySurface(copy.get(), externalTexture); - test_read_pixels(reporter, context, copy.get(), expectedPixelValues); + + sk_sp copy(GrSurfaceProxy::TestCopy(context, copyDesc, + externalTexture, SkBudgeted::kYes)); + + GrSurface* copySurf = copy->instantiate(context->textureProvider()); + + test_read_pixels(reporter, context, copySurf, expectedPixelValues); } DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) { -- cgit v1.2.3