diff options
author | 2015-02-02 13:00:10 -0800 | |
---|---|---|
committer | 2015-02-02 13:00:10 -0800 | |
commit | 37f9a2694c15f08e361ebda74fe9f0fffbf452aa (patch) | |
tree | 2bbbb36f91b31cc203fa375939ab2d4a4a5117f0 /tests | |
parent | 52edc4d05380c88de5b334479ad8e537ef2b4925 (diff) |
Move npot resizing out of GrContext and simplify GrContext texture functions.
Committed: https://skia.googlesource.com/skia/+/8a8100349105c8c6de39fcb34e47679da7a67f54
Committed: https://skia.googlesource.com/skia/+/6c96672491b04cb782bce8fee778124df66524a0
Review URL: https://codereview.chromium.org/882223003
Diffstat (limited to 'tests')
-rw-r--r-- | tests/GLProgramsTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index c3752c48bb..16d44fd9df 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -114,14 +114,14 @@ static GrRenderTarget* random_render_target(GrContext* context, SkRandom* random builder[0] = texDesc.fOrigin; builder.finish(); - SkAutoTUnref<GrTexture> texture(context->findAndRefTexture(texDesc, key, ¶ms)); + GrTexture* texture = context->findAndRefCachedTexture(key); if (!texture) { - texture.reset(context->createTexture(¶ms, texDesc, key, 0, 0)); - if (!texture) { - return NULL; + texture = context->createTexture(texDesc); + if (texture) { + SkAssertResult(context->addResourceToCache(key, texture)); } } - return SkRef(texture->asRenderTarget()); + return texture ? texture->asRenderTarget() : NULL; } static void set_random_xpf(GrContext* context, const GrDrawTargetCaps& caps, |