From 1f47f4f7325971dd53991e2bb02da94fa7c6d962 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 16 Aug 2012 14:49:16 +0000 Subject: Replaced TextureCacheEntry with GrTexture* and a back pointer to GrResourceEntry (in GrTexture) http://codereview.appspot.com/6460089/ git-svn-id: http://skia.googlecode.com/svn/trunk@5122 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/gradients/SkGradientShader.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/effects/gradients') diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index a07b38878d..0bdbe54d54 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -705,16 +705,15 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx, SkBitmap bitmap; shader.getGradientTableBitmap(&bitmap); - GrContext::TextureCacheEntry entry = GrLockCachedBitmapTexture(ctx, bitmap, - sampler->textureParams()); - fTexture = entry.texture(); + fTexture = GrLockCachedBitmapTexture(ctx, bitmap, + sampler->textureParams()); SkSafeRef(fTexture); fUseTexture = true; // Unlock immediately, this is not great, but we don't have a way of // knowing when else to unlock it currently, so it may get purged from // the cache, but it'll still be ref'd until it's no longer being used. - GrUnlockCachedBitmapTexture(ctx, entry); + GrUnlockCachedBitmapTexture(fTexture); } GrGradientEffect::~GrGradientEffect() { -- cgit v1.2.3