diff options
| author |  reed <reed@google.com> | 2016-05-11 08:06:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-11 08:06:11 -0700 |
| commit | 93eeadf7a19d0801074bd8c6d8ac5c4f120e5fbb (patch) | |
| tree | 9f1496a4e41bc2561ecd25ca1cfc78a7ea5d3225 /src/core | |
| parent | e7ef01dcfda0f8ae407ba92cc03cf3f7841ec470 (diff) | |
compressed texture support has been broken/untested for a while, remove cruft
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1970773002
Review-Url: https://codereview.chromium.org/1970773002
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkImageCacherator.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index 0df14df95c..4a8521743d 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -25,6 +25,13 @@ #include "SkGrPriv.h" #endif +// Until we actually have codecs/etc. that can contain/support a GPU texture format +// skip this step, since for some generators, returning their encoded data as a SkData +// can be somewhat expensive, and this call doesn't indicate to the generator that we're +// only interested in GPU datas... +// see skbug.com/ 4971, 5128, ... +//#define SK_SUPPORT_COMPRESSED_TEXTURES_IN_CACHERATOR + SkImageCacherator* SkImageCacherator::NewFromGenerator(SkImageGenerator* gen, const SkIRect* subset) { if (!gen) { @@ -195,6 +202,7 @@ bool SkImageCacherator::lockAsBitmap(SkBitmap* bitmap, const SkImage* client, #if SK_SUPPORT_GPU +#ifdef SK_SUPPORT_COMPRESSED_TEXTURES_IN_CACHERATOR static GrTexture* load_compressed_into_texture(GrContext* ctx, SkData* data, GrSurfaceDesc desc) { const void* rawStart; GrPixelConfig config = GrIsCompressedTextureDataSupported(ctx, data, desc.fWidth, desc.fHeight, @@ -206,6 +214,7 @@ static GrTexture* load_compressed_into_texture(GrContext* ctx, SkData* data, GrS desc.fConfig = config; return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, rawStart, 0); } +#endif class Generator_GrYUVProvider : public GrYUVProvider { SkImageGenerator* fGen; @@ -276,6 +285,7 @@ GrTexture* SkImageCacherator::lockTexture(GrContext* ctx, const GrUniqueKey& key const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(fInfo, *ctx->caps()); +#ifdef SK_SUPPORT_COMPRESSED_TEXTURES_IN_CACHERATOR // 3. Ask the generator to return a compressed form that the GPU might support SkAutoTUnref<SkData> data(this->refEncoded(ctx)); if (data) { @@ -286,6 +296,7 @@ GrTexture* SkImageCacherator::lockTexture(GrContext* ctx, const GrUniqueKey& key return set_key_and_return(tex, key); } } +#endif // 4. Ask the generator to return YUV planes, which the GPU can convert { |