diff options
| author |  reed <reed@google.com> | 2015-09-16 10:09:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-16 10:09:24 -0700 |
| commit | 3322a8137d12255258a937897389ea90ca1ee6fa (patch) | |
| tree | 6e8304a13f506af4538acdddeb0c0e1999f7e572 /src/core | |
| parent | 5d08d44c68f65c71c9fdbbdda601119d87a7beb6 (diff) | |
share code between SkGr and Cacherator
BUG=skia:
Review URL: https://codereview.chromium.org/1351533004
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkImageCacherator.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index dcc5c676f6..f5ec5e3477 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -162,13 +162,6 @@ bool SkImageCacherator::lockAsBitmap(SkBitmap* bitmap) { ////////////////////////////////////////////////////////////////////////////////////////////////// #if SK_SUPPORT_GPU -static void make_texture_desc(const SkImageInfo& info, GrSurfaceDesc* desc) { - desc->fFlags = kNone_GrSurfaceFlags; - desc->fWidth = info.width(); - desc->fHeight = info.height(); - desc->fConfig = SkImageInfo2GrPixelConfig(info); - desc->fSampleCnt = 0; -} static GrTexture* load_compressed_into_texture(GrContext* ctx, SkData* data, GrSurfaceDesc desc) { const void* rawStart; @@ -229,9 +222,6 @@ GrTexture* SkImageCacherator::lockAsTexture(GrContext* ctx, SkImageUsageType usa GrMakeKeyFromImageID(&key, fUniqueID, SkIRect::MakeWH(fInfo.width(), fInfo.height()), *ctx->caps(), usage); - GrSurfaceDesc desc; - make_texture_desc(fInfo, &desc); - // 1. Check the cache for a pre-existing one if (GrTexture* tex = ctx->textureProvider()->findAndRefTextureByUniqueKey(key)) { return tex; @@ -246,6 +236,8 @@ GrTexture* SkImageCacherator::lockAsTexture(GrContext* ctx, SkImageUsageType usa } } + const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(fInfo); + // 3. Ask the generator to return a compressed form that the GPU might support SkAutoTUnref<SkData> data(this->refEncoded()); if (data) { |