diff options
| author |  bungeman <bungeman@google.com> | 2015-05-22 15:22:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-22 15:22:48 -0700 |
| commit | d23a395d519835f78630aaea3f2a2c30ecdffe87 (patch) | |
| tree | 641636014edef293ac894052c95ee955678f9512 /tests | |
| parent | bb106b5f6ee18f7453b63f3a95f421b60a957f39 (diff) | |
Revert of Move DstCoordTexture to GrXP, rename and remove the word "copy" from dstcopytexture names. (patchset #6 id:100001 of https://codereview.chromium.org/1132093004/)
Reason for revert:
This is asserting on GTX660 bots with '!dst'. This may just be catching an existing issue.
https://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/622/steps/dm/logs/stdio
https://build.chromium.org/p/client.skia/builders/Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE/builds/209/steps/dm/logs/stdio
https://build.chromium.org/p/client.skia/builders/Test-Win8-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/318/steps/dm/logs/stdio
Original issue's description:
> Move DstCoordTexture to GrXP, rename and remove the word "copy" from dstcopytexture names.
>
> Committed: https://skia.googlesource.com/skia/+/bb106b5f6ee18f7453b63f3a95f421b60a957f39
TBR=egdaniel@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1158453004
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 78c2e798f0..b01277c854 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -76,7 +76,7 @@ public: const GrProcOptInfo& colorPOI, const GrProcOptInfo& covPOI) { SkAutoTUnref<GrXPFactory> xpf(GrPorterDuffXPFactory::Create(xfermode)); SkAutoTUnref<GrXferProcessor> xp(xpf->createXferProcessor(colorPOI, covPOI, 0, caps)); - TEST_ASSERT(!xpf->willNeedDstTexture(caps, colorPOI, covPOI)); + TEST_ASSERT(!xpf->willNeedDstCopy(caps, colorPOI, covPOI)); xpf->getInvariantOutput(colorPOI, covPOI, &fInvariantOutput); fOptFlags = xp->getOptimizations(colorPOI, covPOI, false, 0, caps); GetXPOutputTypes(xp, &fPrimaryOutputType, &fSecondaryOutputType); @@ -1311,7 +1311,7 @@ static void test_lcd_coverage(skiatest::Reporter* reporter, const GrCaps& caps) SkASSERT(covPOI.isFourChannelOutput()); SkAutoTUnref<GrXPFactory> xpf(GrPorterDuffXPFactory::Create(SkXfermode::kSrcOver_Mode)); - TEST_ASSERT(!xpf->willNeedDstTexture(caps, colorPOI, covPOI)); + TEST_ASSERT(!xpf->willNeedDstCopy(caps, colorPOI, covPOI)); GrXPFactory::InvariantOutput invariantOutput; xpf->getInvariantOutput(colorPOI, covPOI, &invariantOutput); |