diff options
| author |  Stan Iliev <stani@google.com> | 2017-04-19 00:23:39 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-19 00:23:50 +0000 |
| commit | 7fa5c31c2c9af834bee66d5fcf476e250076c8d6 (patch) | |
| tree | 846c27759d4cf4c6487a636872e2e9c88d9137ff /tests/ResourceCacheTest.cpp | |
| parent | edec99b640a7a9dbc7d4fd9f48d35ed3a54c61e3 (diff) | |
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>
Diffstat (limited to 'tests/ResourceCacheTest.cpp')
| -rw-r--r-- | tests/ResourceCacheTest.cpp | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index 17e02ba193..07369380af 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -11,7 +11,6 @@ #if SK_SUPPORT_GPU #include <thread> #include "GrContext.h" -#include "GrContextPriv.h" #include "GrContextFactory.h" #include "GrGpu.h" #include "GrGpuResourceCacheAccess.h" @@ -219,32 +218,22 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ResourceCacheWrappedResources, reporter, ctxI context->resetContext(); - GrBackendTexture backendTex1 = GrTest::CreateBackendTexture(context->contextPriv().getBackend(), - kW, - kH, - kRGBA_8888_GrPixelConfig, - texHandles[0]); + GrBackendTextureDesc desc; + desc.fConfig = kBGRA_8888_GrPixelConfig; + desc.fWidth = kW; + desc.fHeight = kH; + + desc.fTextureHandle = texHandles[0]; sk_sp<GrTexture> borrowed(context->resourceProvider()->wrapBackendTexture( - backendTex1, kTopLeft_GrSurfaceOrigin, kNone_GrBackendTextureFlag, 0, - kBorrow_GrWrapOwnership)); - - GrBackendTexture backendTex2 = GrTest::CreateBackendTexture(context->contextPriv().getBackend(), - kW, - kH, - kRGBA_8888_GrPixelConfig, - texHandles[1]); + desc, kBorrow_GrWrapOwnership)); + + desc.fTextureHandle = texHandles[1]; sk_sp<GrTexture> adopted(context->resourceProvider()->wrapBackendTexture( - backendTex2, kTopLeft_GrSurfaceOrigin, kNone_GrBackendTextureFlag, 0, - kAdopt_GrWrapOwnership)); - - GrBackendTexture backendTex3 = GrTest::CreateBackendTexture(context->contextPriv().getBackend(), - kW, - kH, - kRGBA_8888_GrPixelConfig, - texHandles[2]); + desc, kAdopt_GrWrapOwnership)); + + desc.fTextureHandle = texHandles[2]; sk_sp<GrTexture> adoptedAndCached(context->resourceProvider()->wrapBackendTexture( - backendTex3, kTopLeft_GrSurfaceOrigin, kNone_GrBackendTextureFlag, 0, - kAdoptAndCache_GrWrapOwnership)); + desc, kAdoptAndCache_GrWrapOwnership)); REPORTER_ASSERT(reporter, borrowed != nullptr && adopted != nullptr && adoptedAndCached != nullptr); |