From 8a8100349105c8c6de39fcb34e47679da7a67f54 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Fri, 30 Jan 2015 12:43:44 -0800 Subject: Move npot resizing out of GrContext and simplify GrContext texture functions. Review URL: https://codereview.chromium.org/882223003 --- tests/GLProgramsTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') 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 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, -- cgit v1.2.3