From 02baee973f973e56149147fa7c81a2c9c35d77d8 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 24 Feb 2017 10:37:15 -0500 Subject: Remove the skip-draw xp optimization This seems like extra complexity for a impractical case. Also, if this is important a lot more work could be saved by catching this upstack (e.g. SkCanvas or SkPaintToGrPaint). Change-Id: Ib47be9f3cdc8ce9e5b12d9e9eac5266f04c337a9 Reviewed-on: https://skia-review.googlesource.com/8949 Reviewed-by: Greg Daniel Commit-Queue: Brian Salomon --- tests/GrPorterDuffTest.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'tests/GrPorterDuffTest.cpp') diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index d87e252141..bfbd97e387 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -58,7 +58,6 @@ enum { enum { kNone_OptFlags = GrXferProcessor::kNone_OptFlags, - kSkipDraw_OptFlag = GrXferProcessor::kSkipDraw_OptFlag, kIgnoreColor_OptFlag = GrXferProcessor::kIgnoreColor_OptFlag, kCanTweakAlphaForCoverage_OptFlag = GrXferProcessor::kCanTweakAlphaForCoverage_OptFlag }; @@ -127,8 +126,7 @@ static void test_lcd_coverage(skiatest::Reporter* reporter, const GrCaps& caps) break; case SkBlendMode::kDst: TEST_ASSERT(xpi.fReadsDst); - TEST_ASSERT((kSkipDraw_OptFlag | - kIgnoreColor_OptFlag | + TEST_ASSERT((kIgnoreColor_OptFlag | kCanTweakAlphaForCoverage_OptFlag) == xpi.fOptFlags); TEST_ASSERT(kNone_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); @@ -297,8 +295,7 @@ static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const break; case SkBlendMode::kDst: TEST_ASSERT(xpi.fReadsDst); - TEST_ASSERT((kSkipDraw_OptFlag | - kIgnoreColor_OptFlag | + TEST_ASSERT((kIgnoreColor_OptFlag | kCanTweakAlphaForCoverage_OptFlag) == xpi.fOptFlags); TEST_ASSERT(kNone_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); @@ -468,8 +465,7 @@ static void test_color_unknown_no_coverage(skiatest::Reporter* reporter, const G break; case SkBlendMode::kDst: TEST_ASSERT(xpi.fReadsDst); - TEST_ASSERT((kSkipDraw_OptFlag | - kIgnoreColor_OptFlag | + TEST_ASSERT((kIgnoreColor_OptFlag | kCanTweakAlphaForCoverage_OptFlag) == xpi.fOptFlags); TEST_ASSERT(kNone_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); @@ -640,8 +636,7 @@ static void test_color_opaque_with_coverage(skiatest::Reporter* reporter, const break; case SkBlendMode::kDst: TEST_ASSERT(xpi.fReadsDst); - TEST_ASSERT((kSkipDraw_OptFlag | - kIgnoreColor_OptFlag | + TEST_ASSERT((kIgnoreColor_OptFlag | kCanTweakAlphaForCoverage_OptFlag) == xpi.fOptFlags); TEST_ASSERT(kNone_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); @@ -682,8 +677,7 @@ static void test_color_opaque_with_coverage(skiatest::Reporter* reporter, const break; case SkBlendMode::kDstIn: TEST_ASSERT(xpi.fReadsDst); - TEST_ASSERT((kSkipDraw_OptFlag | - kIgnoreColor_OptFlag | + TEST_ASSERT((kIgnoreColor_OptFlag | kCanTweakAlphaForCoverage_OptFlag) == xpi.fOptFlags); TEST_ASSERT(kNone_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); @@ -814,8 +808,7 @@ static void test_color_opaque_no_coverage(skiatest::Reporter* reporter, const Gr break; case SkBlendMode::kDst: TEST_ASSERT(xpi.fReadsDst); - TEST_ASSERT((kSkipDraw_OptFlag | - kIgnoreColor_OptFlag | + TEST_ASSERT((kIgnoreColor_OptFlag | kCanTweakAlphaForCoverage_OptFlag) == xpi.fOptFlags); TEST_ASSERT(kNone_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); @@ -856,8 +849,7 @@ static void test_color_opaque_no_coverage(skiatest::Reporter* reporter, const Gr break; case SkBlendMode::kDstIn: TEST_ASSERT(xpi.fReadsDst); - TEST_ASSERT((kSkipDraw_OptFlag | - kIgnoreColor_OptFlag | + TEST_ASSERT((kIgnoreColor_OptFlag | kCanTweakAlphaForCoverage_OptFlag) == xpi.fOptFlags); TEST_ASSERT(kNone_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); -- cgit v1.2.3