diff options
| author |  bsalomon <bsalomon@google.com> | 2015-07-08 10:20:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-08 10:20:21 -0700 |
| commit | d07a2793baea42956d27b3ad47ed562f08e4570a (patch) | |
| tree | 43f0a8ac998e1fc05b7063e65c3f69317f209e68 /tests | |
| parent | 60c047557559e5410063452e59d65377e813e5f2 (diff) | |
Revert of Rework GrPipelineInfo (patchset #7 id:120001 of https://codereview.chromium.org/1213383005/)
Reason for revert:
breaking stuff!
Original issue's description:
> Makes GrPipelineInfo a class with query functions used by GrBatch subclasses.
>
> Committed: https://skia.googlesource.com/skia/+/f5179a4c490bc787190321bd8ffdb0e6a4efa9ac
TBR=joshualitt@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1213013003
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index b7f7572896..def7280eee 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -62,7 +62,7 @@ enum { }; enum { - kNone_OptFlags = GrXferProcessor::kNone_OptFlags, + kNone_Opt = GrXferProcessor::kNone_Opt, kSkipDraw_OptFlag = GrXferProcessor::kSkipDraw_OptFlag, kIgnoreColor_OptFlag = GrXferProcessor::kIgnoreColor_OptFlag, kIgnoreCoverage_OptFlag = GrXferProcessor::kIgnoreCoverage_OptFlag, @@ -128,7 +128,7 @@ static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const case SkXfermode::kSrc_Mode: TEST_ASSERT(!xpi.fBlendedColor.fWillBlendWithDst); TEST_ASSERT(kNone_GrColorComponentFlags == xpi.fBlendedColor.fKnownColorFlags); - TEST_ASSERT((kNone_OptFlags) == xpi.fOptFlags); + TEST_ASSERT((kNone_Opt) == xpi.fOptFlags); TEST_ASSERT(kModulate_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kCoverage_OutputType == xpi.fSecondaryOutputType); TEST_ASSERT(kAdd_GrBlendEquation == xpi.fBlendInfo.fEquation); @@ -175,7 +175,7 @@ static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const case SkXfermode::kSrcIn_Mode: TEST_ASSERT(xpi.fBlendedColor.fWillBlendWithDst); TEST_ASSERT(kNone_GrColorComponentFlags == xpi.fBlendedColor.fKnownColorFlags); - TEST_ASSERT((kNone_OptFlags) == xpi.fOptFlags); + TEST_ASSERT((kNone_Opt) == xpi.fOptFlags); TEST_ASSERT(kModulate_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kCoverage_OutputType == xpi.fSecondaryOutputType); TEST_ASSERT(kAdd_GrBlendEquation == xpi.fBlendInfo.fEquation); @@ -186,7 +186,7 @@ static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const case SkXfermode::kDstIn_Mode: TEST_ASSERT(xpi.fBlendedColor.fWillBlendWithDst); TEST_ASSERT(kNone_GrColorComponentFlags == xpi.fBlendedColor.fKnownColorFlags); - TEST_ASSERT((kNone_OptFlags) == xpi.fOptFlags); + TEST_ASSERT((kNone_Opt) == xpi.fOptFlags); TEST_ASSERT(kISAModulate_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); TEST_ASSERT(kReverseSubtract_GrBlendEquation == xpi.fBlendInfo.fEquation); @@ -197,7 +197,7 @@ static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const case SkXfermode::kSrcOut_Mode: TEST_ASSERT(xpi.fBlendedColor.fWillBlendWithDst); TEST_ASSERT(kNone_GrColorComponentFlags == xpi.fBlendedColor.fKnownColorFlags); - TEST_ASSERT((kNone_OptFlags) == xpi.fOptFlags); + TEST_ASSERT((kNone_Opt) == xpi.fOptFlags); TEST_ASSERT(kModulate_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kCoverage_OutputType == xpi.fSecondaryOutputType); TEST_ASSERT(kAdd_GrBlendEquation == xpi.fBlendInfo.fEquation); @@ -230,7 +230,7 @@ static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const case SkXfermode::kDstATop_Mode: TEST_ASSERT(xpi.fBlendedColor.fWillBlendWithDst); TEST_ASSERT(kNone_GrColorComponentFlags == xpi.fBlendedColor.fKnownColorFlags); - TEST_ASSERT((kNone_OptFlags) == xpi.fOptFlags); + TEST_ASSERT((kNone_Opt) == xpi.fOptFlags); TEST_ASSERT(kModulate_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kISAModulate_OutputType == xpi.fSecondaryOutputType); TEST_ASSERT(kAdd_GrBlendEquation == xpi.fBlendInfo.fEquation); @@ -263,7 +263,7 @@ static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const case SkXfermode::kModulate_Mode: TEST_ASSERT(xpi.fBlendedColor.fWillBlendWithDst); TEST_ASSERT(kNone_GrColorComponentFlags == xpi.fBlendedColor.fKnownColorFlags); - TEST_ASSERT((kNone_OptFlags) == xpi.fOptFlags); + TEST_ASSERT((kNone_Opt) == xpi.fOptFlags); TEST_ASSERT(kISCModulate_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); TEST_ASSERT(kReverseSubtract_GrBlendEquation == xpi.fBlendInfo.fEquation); @@ -663,7 +663,7 @@ static void test_color_opaque_with_coverage(skiatest::Reporter* reporter, const case SkXfermode::kModulate_Mode: TEST_ASSERT(xpi.fBlendedColor.fWillBlendWithDst); TEST_ASSERT(kNone_GrColorComponentFlags == xpi.fBlendedColor.fKnownColorFlags); - TEST_ASSERT((kNone_OptFlags) == xpi.fOptFlags); + TEST_ASSERT((kNone_Opt) == xpi.fOptFlags); TEST_ASSERT(kISCModulate_OutputType == xpi.fPrimaryOutputType); TEST_ASSERT(kNone_OutputType == xpi.fSecondaryOutputType); TEST_ASSERT(kReverseSubtract_GrBlendEquation == xpi.fBlendInfo.fEquation); |