diff options
| author |  sugoi <sugoi@chromium.org> | 2014-09-10 13:40:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-10 13:40:18 -0700 |
| commit | d9ec549071581d9d1dc2e5fac3163305ae935a39 (patch) | |
| tree | c0a25b8d61578f2f087f02078ded1ee2337d2dba /src/gpu | |
| parent | fd731ce804cd3223318f3feee2c98404890b65f2 (diff) | |
Added test for non cached ETC1
BUG=skia:
R=bsalomon@chromium.org, robertphillips@chromium.org, robertphillips@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/564493002
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/SkGr.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 73773b00d1..cdbdc41c85 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -139,7 +139,7 @@ static GrTexture* sk_gr_allocate_texture(GrContext* ctx, bool cache, const GrTextureParams* params, const SkBitmap& bm, - GrTextureDesc desc, + const GrTextureDesc& desc, const void* pixels, size_t rowBytes) { GrTexture* result; @@ -322,12 +322,9 @@ static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx, // Is this an ETC1 encoded texture? #ifndef SK_IGNORE_ETC1_SUPPORT else if ( - // We do not support scratch ETC1 textures, hence they should all be at least - // trying to go to the cache. - cache // Make sure that the underlying device supports ETC1 textures before we go ahead // and check the data. - && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig) + ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig) // If the bitmap had compressed data and was then uncompressed, it'll still return // compressed data on 'refEncodedData' and upload it. Probably not good, since if // the bitmap has available pixels, then they might not be what the decompressed |