diff options
| -rw-r--r-- | gm/mipmap.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/SkGr.cpp | 9 |
2 files changed, 0 insertions, 11 deletions
diff --git a/gm/mipmap.cpp b/gm/mipmap.cpp index f7bd715016..19aff9d83b 100644 --- a/gm/mipmap.cpp +++ b/gm/mipmap.cpp @@ -135,8 +135,6 @@ static void show_mips_only(SkCanvas* canvas, SkImage* img) { * * Ensure that in S32 drawing mode, all images/mips look the same, and look correct (i.e. * the mip levels match the original in brightness). - * - * This test also verifies handling of Gray_8 data in Ganesh, which is not done natively. */ DEF_SIMPLE_GM(mipmap_gray8_srgb, canvas, 260, 230) { sk_sp<SkImage> limg = make_g8_gradient(nullptr); diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 9ba094714e..18f2abb951 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -238,15 +238,6 @@ GrTexture* GrGenerateMipMapsAndUploadToTexture(GrContext* ctx, const SkBitmap& b GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bitmap.info(), *ctx->caps()); - // We don't support Gray8 directly in the GL backend, so fail-over to GrUploadBitmapToTexture. - // That will transform the Gray8 to 8888, then use the driver/GPU to build mipmaps. If we build - // the mips on the CPU here, they'll all be Gray8, which isn't useful. (They get treated as A8). - // TODO: A better option might be to transform the initial bitmap here to 8888, then run the - // CPU mip-mapper on that data before uploading. This is much less code for a rare case though: - if (kGray_8_SkColorType == bitmap.colorType()) { - return nullptr; - } - SkAutoPixmapUnlock srcUnlocker; if (!bitmap.requestLock(&srcUnlocker)) { return nullptr; |