diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-04-20 16:41:55 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-20 17:17:43 +0000 |
| commit | 7ef28f35a2f7d17b90c776f76d4b374ccee6c347 (patch) | |
| tree | 0e59cfede60a2173c53f701661927cc4e045c74c /tests/GrPorterDuffTest.cpp | |
| parent | 774831a4e80f49cfec3cb78f684bd44cb19a7b2a (diff) | |
Revert "Revert "Plumb GrBackendTexture throughout skia.""
This reverts commit 7fa5c31c2c9af834bee66d5fcf476e250076c8d6.
Reason for revert: Relanding this change now that other fixes have landed.
Original change's description:
> Revert "Plumb GrBackendTexture throughout skia."
>
> This reverts commit 7da62b9059f3c1d31624a0e4da96ee5f908f9c12.
>
> Reason for revert: fix android roll
>
> Original change's description:
> > Plumb GrBackendTexture throughout skia.
> >
> > Bug: skia:
> > Change-Id: I1bae6768ee7229818a83ba608035a1f7867e6875
> > Reviewed-on: https://skia-review.googlesource.com/13645
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
> >
>
> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org,stani@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Change-Id: I5cb8763cc837c83ebc6d10366fe2dd3efe35fb89
> Reviewed-on: https://skia-review.googlesource.com/13773
> Reviewed-by: Stan Iliev <stani@google.com>
> Commit-Queue: Stan Iliev <stani@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org,brianosman@google.com,stani@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I92bc074e4fe37fa5c83186afadc472c03802e8f2
Reviewed-on: https://skia-review.googlesource.com/13975
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests/GrPorterDuffTest.cpp')
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index f4b74c7cda..780573d34f 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -11,8 +11,10 @@ #include "GrContextFactory.h" #include "GrContextOptions.h" +#include "GrContextPriv.h" #include "GrGpu.h" #include "GrResourceProvider.h" +#include "GrTest.h" #include "GrXferProcessor.h" #include "effects/GrPorterDuffXferProcessor.h" #include "gl/GrGLCaps.h" @@ -1034,15 +1036,19 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { return; } - GrBackendObject backendTex = + GrBackendObject backendTexHandle = ctx->getGpu()->createTestingOnlyBackendTexture(nullptr, 100, 100, kRGBA_8888_GrPixelConfig); - GrBackendTextureDesc fakeDesc; - fakeDesc.fConfig = kRGBA_8888_GrPixelConfig; - fakeDesc.fWidth = fakeDesc.fHeight = 100; - fakeDesc.fTextureHandle = backendTex; + GrBackendTexture backendTex = GrTest::CreateBackendTexture(ctx->contextPriv().getBackend(), + 100, + 100, + kRGBA_8888_GrPixelConfig, + backendTexHandle); + GrXferProcessor::DstTexture fakeDstTexture; fakeDstTexture.setTexture( - ctx->resourceProvider()->wrapBackendTexture(fakeDesc, kBorrow_GrWrapOwnership)); + ctx->resourceProvider()->wrapBackendTexture(backendTex, kTopLeft_GrSurfaceOrigin, + kNone_GrBackendTextureFlag, 0, + kBorrow_GrWrapOwnership)); static const GrProcessorAnalysisColor colorInputs[] = { GrProcessorAnalysisColor::Opaque::kNo, GrProcessorAnalysisColor::Opaque::kYes, @@ -1065,7 +1071,7 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { } } } - ctx->getGpu()->deleteTestingOnlyBackendTexture(backendTex); + ctx->getGpu()->deleteTestingOnlyBackendTexture(backendTexHandle); } #endif |