commit fb0c8fc3d5413a3ec357680d85084a17bb9ef64f
author Derek Sollenberger <djsollen@google.com> Wed Jul 26 13:53:27 2017 -0400
committer Stan Iliev <stani@google.com> Thu Jul 27 10:52:11 2017 -0400
tree a1952c3daf90ff2dc6441c489619a27be6de4b22
parent 25b14a1a2881e11716844a56b6fdbeae9099527b

Enable colorspace conversion while perserving legacy blending.

When requesting an SkImage from a android::Bitmap we will also
return a colorFilter that will perform the sRGB conversion at draw
time.

Bug: 62347704
Test: CtsUiRenderingTestCases, CtsGraphicsTestCases, CtsViewTestCases
Change-Id: Icc4694e2c42605e29fcc834c252bc21263bac658

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
index bf77446..5f8ee18 100644
--- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
@@ -305,12 +305,6 @@
         return nullptr;
     }
 
-    auto colorSpace = info.colorSpace();
-    bool convertToSRGB = false;
-    if (colorSpace && (!colorSpace->isSRGB())) {
-        isSupported = false;
-        convertToSRGB = true;
-    }
 
     SkBitmap bitmap;
     if (isSupported) {
@@ -319,7 +313,7 @@
         bitmap.allocPixels(SkImageInfo::MakeN32(info.width(), info.height(), info.alphaType(),
                 nullptr));
         bitmap.eraseColor(0);
-        if (info.colorType() == kRGBA_F16_SkColorType || convertToSRGB) {
+        if (info.colorType() == kRGBA_F16_SkColorType) {
             // Drawing RGBA_F16 onto ARGB_8888 is not supported
             skBitmap.readPixels(bitmap.info().makeColorSpace(SkColorSpace::MakeSRGB()),
                     bitmap.getPixels(), bitmap.rowBytes(), 0, 0);