From 7da62b9059f3c1d31624a0e4da96ee5f908f9c12 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Tue, 18 Apr 2017 17:12:32 -0400 Subject: Plumb GrBackendTexture throughout skia. Bug: skia: Change-Id: I1bae6768ee7229818a83ba608035a1f7867e6875 Reviewed-on: https://skia-review.googlesource.com/13645 Commit-Queue: Greg Daniel Reviewed-by: Robert Phillips --- tests/EGLImageTest.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'tests/EGLImageTest.cpp') diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index 998e339abe..1b94a6e602 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp @@ -13,6 +13,7 @@ #include "GrContextFactory.h" #include "GrShaderCaps.h" #include "GrSurfaceContext.h" +#include "GrTest.h" #include "gl/GrGLGpu.h" #include "gl/GrGLUtil.h" #include "gl/GLTestContext.h" @@ -129,14 +130,12 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) { externalTexture.fID = glCtx0->eglImageToExternalTexture(image); // Wrap this texture ID in a GrTexture - GrBackendTextureDesc externalDesc; - externalDesc.fConfig = kRGBA_8888_GrPixelConfig; - externalDesc.fWidth = kSize; - externalDesc.fHeight = kSize; - externalDesc.fTextureHandle = reinterpret_cast(&externalTexture); + GrBackendTexture backendTex(kSize, kSize, kRGBA_8888_GrPixelConfig, &externalTexture); + // TODO: If I make this TopLeft origin to match resolve_origin calls for kDefault, this test + // fails on the Nexus5. Why? sk_sp surfaceContext = context0->contextPriv().makeBackendSurfaceContext( - externalDesc, nullptr); + backendTex, kBottomLeft_GrSurfaceOrigin, kNone_GrBackendTextureFlag, 0, nullptr); if (!surfaceContext) { ERRORF(reporter, "Error wrapping external texture in GrSurfaceContext."); @@ -146,25 +145,21 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) { // Should not be able to wrap as a RT { - externalDesc.fFlags = kRenderTarget_GrBackendTextureFlag; - sk_sp temp = context0->contextPriv().makeBackendSurfaceContext( - externalDesc, nullptr); + backendTex, kBottomLeft_GrSurfaceOrigin, kRenderTarget_GrBackendTextureFlag, 0, + nullptr); if (temp) { ERRORF(reporter, "Should not be able to wrap an EXTERNAL texture as a RT."); } - externalDesc.fFlags = kNone_GrBackendTextureFlag; } // Should not be able to wrap with a sample count { - externalDesc.fSampleCnt = 4; sk_sp temp = context0->contextPriv().makeBackendSurfaceContext( - externalDesc, nullptr); + backendTex, kBottomLeft_GrSurfaceOrigin, kNone_GrBackendTextureFlag, 4, nullptr); if (temp) { ERRORF(reporter, "Should not be able to wrap an EXTERNAL texture with MSAA."); } - externalDesc.fSampleCnt = 0; } test_read_pixels(reporter, surfaceContext.get(), pixels.get(), "EGLImageTest-read"); -- cgit v1.2.3