From e79a2dab91a90e26b13bc1ec9b8c6264a1ab22e4 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Fri, 24 Oct 2014 12:42:51 -0700 Subject: When bmp is not cached don't upload as index8 format. Review URL: https://codereview.chromium.org/673883002 --- src/gpu/SkGr.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/gpu') diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index e7d4ea121f..f9bdd8e45b 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -34,7 +34,7 @@ Ganesh wants a full 256 palette entry, even though Skia's ctable is only as big as the colortable.count says it is. */ -static void build_compressed_data(void* buffer, const SkBitmap& bitmap) { +static void build_index8_data(void* buffer, const SkBitmap& bitmap) { SkASSERT(kIndex_8_SkColorType == bitmap.colorType()); SkAutoLockPixels alp(bitmap); @@ -308,12 +308,11 @@ static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx, if (kIndex_8_SkColorType == bitmap->colorType()) { // build_compressed_data doesn't do npot->pot expansion // and paletted textures can't be sub-updated - if (ctx->supportsIndex8PixelConfig(params, bitmap->width(), bitmap->height())) { + if (cache && ctx->supportsIndex8PixelConfig(params, bitmap->width(), bitmap->height())) { size_t imageSize = GrCompressedFormatDataSize(kIndex_8_GrPixelConfig, bitmap->width(), bitmap->height()); SkAutoMalloc storage(imageSize); - - build_compressed_data(storage.get(), origBitmap); + build_index8_data(storage.get(), origBitmap); // our compressed data will be trimmed, so pass width() for its // "rowBytes", since they are the same now. -- cgit v1.2.3