diff options
| author |  bsalomon <bsalomon@google.com> | 2015-07-31 13:59:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-31 13:59:31 -0700 |
| commit | eae6200acbec2255ac00ab363ffbe16758ec9076 (patch) | |
| tree | a37be1fb02820c40d0ad99366b557997d6b78831 /tests | |
| parent | 77d89f7dd243a17452d3a5f16a98622993e6bdd9 (diff) | |
Some cleanup in GrTextureProvider and GrResourceProvider.
Review URL: https://codereview.chromium.org/1261643004
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 6 | ||||
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 2 | ||||
| -rw-r--r-- | tests/TessellatingPathRendererTests.cpp | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index d36c48d82e..ded1492f98 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -200,13 +200,13 @@ bool GrDrawTarget::programUnitTest(GrContext* context, int maxStages) { dummyDesc.fWidth = 34; dummyDesc.fHeight = 18; SkAutoTUnref<GrTexture> dummyTexture1( - fResourceProvider->createTexture(dummyDesc, false, NULL, 0)); + context->textureProvider()->createTexture(dummyDesc, false, NULL, 0)); dummyDesc.fFlags = kNone_GrSurfaceFlags; dummyDesc.fConfig = kAlpha_8_GrPixelConfig; dummyDesc.fWidth = 16; dummyDesc.fHeight = 22; SkAutoTUnref<GrTexture> dummyTexture2( - fResourceProvider->createTexture(dummyDesc, false, NULL, 0)); + context->textureProvider()->createTexture(dummyDesc, false, NULL, 0)); if (!dummyTexture1 || ! dummyTexture2) { SkDebugf("Could not allocate dummy textures"); @@ -226,7 +226,7 @@ bool GrDrawTarget::programUnitTest(GrContext* context, int maxStages) { for (int t = 0; t < NUM_TESTS; t++) { // setup random render target(can fail) SkAutoTUnref<GrRenderTarget> rt(random_render_target( - fResourceProvider, &random, this->caps())); + context->textureProvider(), &random, this->caps())); if (!rt.get()) { SkDebugf("Could not allocate render target"); return false; diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index b7f7572896..5dcdfb1830 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -966,7 +966,7 @@ static void test_no_dual_source_blending(skiatest::Reporter* reporter) { fakeDesc.fConfig = kRGBA_8888_GrPixelConfig; fakeDesc.fWidth = fakeDesc.fHeight = 100; fakeDesc.fTextureHandle = 1; - SkAutoTUnref<GrTexture> fakeTexture(ctx->resourceProvider()->wrapBackendTexture(fakeDesc, + SkAutoTUnref<GrTexture> fakeTexture(ctx->textureProvider()->wrapBackendTexture(fakeDesc, kBorrow_GrWrapOwnership)); GrXferProcessor::DstTexture fakeDstTexture; fakeDstTexture.setTexture(fakeTexture); diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp index d6d33307e1..dbfd825038 100644 --- a/tests/TessellatingPathRendererTests.cpp +++ b/tests/TessellatingPathRendererTests.cpp @@ -261,8 +261,7 @@ DEF_GPUTEST(TessellatingPathRendererTests, reporter, factory) { desc.fHeight = 800; desc.fConfig = kSkia8888_GrPixelConfig; desc.fOrigin = kTopLeft_GrSurfaceOrigin; - SkAutoTUnref<GrTexture> texture(context->textureProvider()->refScratchTexture(desc, - GrTextureProvider::kExact_ScratchTexMatch)); + SkAutoTUnref<GrTexture> texture(context->textureProvider()->createApproxTexture(desc)); GrTestTarget tt; context->getTestTarget(&tt); GrRenderTarget* rt = texture->asRenderTarget(); |