From 9f772a44fe90e19841fd86ab29f259f8791413f4 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 10 Jul 2017 13:03:50 -0400 Subject: Skip GLPrograms test on D3D9 ANGLE to avoid NaN literals bug Bug: skia:6842 Change-Id: I0bf58f2a00de66cae161561fc87e7adaac651e4f Reviewed-on: https://skia-review.googlesource.com/22064 Reviewed-by: Brian Salomon Commit-Queue: Brian Osman --- tests/GLProgramsTest.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/GLProgramsTest.cpp') diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index a5c5f66fae..178676431f 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -283,7 +283,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages, int ma // dummy scissor state GrScissorState scissor; - SkRandom random(1); + SkRandom random; static const int NUM_TESTS = 1024; for (int t = 0; t < NUM_TESTS; t++) { // setup random render target(can fail) @@ -389,6 +389,13 @@ static void test_glprograms(skiatest::Reporter* reporter, const sk_gpu_test::Con if (maxLevels == 0) { return; } + + // Disable this test on ANGLE D3D9 configurations. We keep hitting a D3D compiler bug. + // See skbug.com/6842 and anglebug.com/2098 + if (sk_gpu_test::GrContextFactory::kANGLE_D3D9_ES2_ContextType == ctxInfo.type()) { + return; + } + REPORTER_ASSERT(reporter, GrDrawingManager::ProgramUnitTest(ctxInfo.grContext(), maxStages, maxLevels)); } -- cgit v1.2.3