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/ResourceCacheTest.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/ResourceCacheTest.cpp')
-rw-r--r-- | tests/ResourceCacheTest.cpp | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index 07369380af..17e02ba193 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -11,6 +11,7 @@ #if SK_SUPPORT_GPU #include <thread> #include "GrContext.h" +#include "GrContextPriv.h" #include "GrContextFactory.h" #include "GrGpu.h" #include "GrGpuResourceCacheAccess.h" @@ -218,22 +219,32 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ResourceCacheWrappedResources, reporter, ctxI context->resetContext(); - GrBackendTextureDesc desc; - desc.fConfig = kBGRA_8888_GrPixelConfig; - desc.fWidth = kW; - desc.fHeight = kH; - - desc.fTextureHandle = texHandles[0]; + GrBackendTexture backendTex1 = GrTest::CreateBackendTexture(context->contextPriv().getBackend(), + kW, + kH, + kRGBA_8888_GrPixelConfig, + texHandles[0]); sk_sp<GrTexture> borrowed(context->resourceProvider()->wrapBackendTexture( - desc, kBorrow_GrWrapOwnership)); - - desc.fTextureHandle = texHandles[1]; + backendTex1, kTopLeft_GrSurfaceOrigin, kNone_GrBackendTextureFlag, 0, + kBorrow_GrWrapOwnership)); + + GrBackendTexture backendTex2 = GrTest::CreateBackendTexture(context->contextPriv().getBackend(), + kW, + kH, + kRGBA_8888_GrPixelConfig, + texHandles[1]); sk_sp<GrTexture> adopted(context->resourceProvider()->wrapBackendTexture( - desc, kAdopt_GrWrapOwnership)); - - desc.fTextureHandle = texHandles[2]; + backendTex2, kTopLeft_GrSurfaceOrigin, kNone_GrBackendTextureFlag, 0, + kAdopt_GrWrapOwnership)); + + GrBackendTexture backendTex3 = GrTest::CreateBackendTexture(context->contextPriv().getBackend(), + kW, + kH, + kRGBA_8888_GrPixelConfig, + texHandles[2]); sk_sp<GrTexture> adoptedAndCached(context->resourceProvider()->wrapBackendTexture( - desc, kAdoptAndCache_GrWrapOwnership)); + backendTex3, kTopLeft_GrSurfaceOrigin, kNone_GrBackendTextureFlag, 0, + kAdoptAndCache_GrWrapOwnership)); REPORTER_ASSERT(reporter, borrowed != nullptr && adopted != nullptr && adoptedAndCached != nullptr); |