aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/SkGr.cpp
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2014-10-07 07:27:07 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-07 07:27:07 -0700
commitd14e1a27643125bfef37fa0ed314b64c1fae22b7 (patch)
treef4ee6543d77aff0e233dace6c81403364b79fdba /src/gpu/SkGr.cpp
parentb109ac22b4ec3ab3478f5304c96564a0e9df6170 (diff)
GrResourceCache2 manages scratch texture.
Diffstat (limited to 'src/gpu/SkGr.cpp')
-rw-r--r--src/gpu/SkGr.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index e81abdbae4..d9435459f1 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -369,9 +369,9 @@ bool GrIsBitmapInCache(const GrContext* ctx,
return ctx->isTextureInCache(desc, cacheID, params);
}
-GrTexture* GrLockAndRefCachedBitmapTexture(GrContext* ctx,
- const SkBitmap& bitmap,
- const GrTextureParams* params) {
+GrTexture* GrRefCachedBitmapTexture(GrContext* ctx,
+ const SkBitmap& bitmap,
+ const GrTextureParams* params) {
GrTexture* result = NULL;
bool cache = !bitmap.isVolatile();
@@ -397,13 +397,6 @@ GrTexture* GrLockAndRefCachedBitmapTexture(GrContext* ctx,
return result;
}
-void GrUnlockAndUnrefCachedBitmapTexture(GrTexture* texture) {
- SkASSERT(texture->getContext());
-
- texture->getContext()->unlockScratchTexture(texture);
- texture->unref();
-}
-
///////////////////////////////////////////////////////////////////////////////
// alphatype is ignore for now, but if GrPixelConfig is expanded to encompass