From eb4f186779cf2f4fd778ba35e63cad539cd0c2ae Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Thu, 8 Jun 2017 16:38:25 -0400 Subject: Disable ReadPixels_Texture & ReadPixels_Gpu on ANGLE Depends on https://skia-review.googlesource.com/c/19101/ (Store context type (rather than backend type) in ContextInfo) Bug: skia:6742 Change-Id: I321c01838acf93ad28a17d8e97aa1bf594425502 Reviewed-on: https://skia-review.googlesource.com/19077 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- tests/ReadPixelsTest.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests/ReadPixelsTest.cpp') diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index 9363e71a00..18a2525922 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -16,6 +16,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrContextFactory.h" #include "GrContextPriv.h" #include "GrResourceProvider.h" #include "SkGr.h" @@ -391,6 +392,13 @@ DEF_TEST(ReadPixels, reporter) { } #if SK_SUPPORT_GPU DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadPixels_Gpu, reporter, ctxInfo) { + if (ctxInfo.type() == sk_gpu_test::GrContextFactory::kANGLE_D3D9_ES2_ContextType || + ctxInfo.type() == sk_gpu_test::GrContextFactory::kANGLE_GL_ES2_ContextType || + ctxInfo.type() == sk_gpu_test::GrContextFactory::kANGLE_D3D11_ES2_ContextType) { + // skbug.com/6742 ReadPixels_Texture & _Gpu don't work with ANGLE ES2 configs + return; + } + const SkImageInfo ii = SkImageInfo::MakeN32Premul(DEV_W, DEV_H); for (auto& origin : {kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin}) { sk_sp surface(SkSurface::MakeRenderTarget(ctxInfo.grContext(), SkBudgeted::kNo, @@ -434,6 +442,13 @@ static void test_readpixels_texture(skiatest::Reporter* reporter, } DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadPixels_Texture, reporter, ctxInfo) { + if (ctxInfo.type() == sk_gpu_test::GrContextFactory::kANGLE_D3D9_ES2_ContextType || + ctxInfo.type() == sk_gpu_test::GrContextFactory::kANGLE_GL_ES2_ContextType || + ctxInfo.type() == sk_gpu_test::GrContextFactory::kANGLE_D3D11_ES2_ContextType) { + // skbug.com/6742 ReadPixels_Texture & _Gpu don't work with ANGLE ES2 configs + return; + } + GrContext* context = ctxInfo.grContext(); SkBitmap bmp = make_src_bitmap(); -- cgit v1.2.3