From c73a1ecbed64652b3d7aa8dc6face9a2205ce830 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 14 Nov 2016 15:09:56 -0500 Subject: Support decoding images to multiple formats, depending on usage Our codec generator will now preserve any asked-for color space, and convert the encoded data to that representation. Cacherator now allows decoding an image to both legacy (nullptr color space), and color-correct formats. In color-correct mode, we choose the best decoded format, based on the original properties, and our backend's capabilities. Preference is given to the native format, when it's already texturable (sRGB 8888 or F16 linear). Otherwise, we prefer linear F16, and fall back to sRGB when that's not an option. BUG=skia:5907 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4438 Change-Id: I847c243dcfb72d8c0f1f6fc73c09547adea933f0 Reviewed-on: https://skia-review.googlesource.com/4438 Reviewed-by: Matt Sarett Commit-Queue: Brian Osman --- tests/SpecialImageTest.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'tests/SpecialImageTest.cpp') diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index 62a5da6089..8cd874a3c8 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -155,19 +155,20 @@ DEF_TEST(SpecialImage_Raster, reporter) { } } -DEF_TEST(SpecialImage_Image, reporter) { +static void test_specialimage_image(skiatest::Reporter* reporter, + SkDestinationSurfaceColorMode colorMode) { SkBitmap bm = create_bm(); sk_sp fullImage(SkImage::MakeFromBitmap(bm)); sk_sp fullSImage(SkSpecialImage::MakeFromImage( SkIRect::MakeWH(kFullSize, kFullSize), - fullImage)); + fullImage, colorMode)); const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize); { - sk_sp subSImg1(SkSpecialImage::MakeFromImage(subset, fullImage)); + sk_sp subSImg1(SkSpecialImage::MakeFromImage(subset, fullImage, colorMode)); test_image(subSImg1, reporter, nullptr, false, kPad, kFullSize); } @@ -177,6 +178,14 @@ DEF_TEST(SpecialImage_Image, reporter) { } } +DEF_TEST(SpecialImage_Image_Legacy, reporter) { + test_specialimage_image(reporter, SkDestinationSurfaceColorMode::kLegacy); +} + +DEF_TEST(SpecialImage_Image_ColorSpaceAware, reporter) { + test_specialimage_image(reporter, SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware); +} + #if SK_SUPPORT_GPU static void test_texture_backed(skiatest::Reporter* reporter, -- cgit v1.2.3