commit 4ed9ae4b230425df7735bc4a3778da00f63178de
author Stan Iliev <stani@google.com> Tue Jul 25 11:59:12 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 25 18:34:01 2017 +0000
tree 44244b8ee7dcdf70926501fdec4f20034f62dffc
parent c47f223d14d562ad9899f64073d8134287982926

Improve GrGLNonlinearColorSpaceXformEffect to support scRGB

Improve GrGLNonlinearColorSpaceXformEffect to correctly implement
scRGB transfer function and allow for negative colors.
Relax SkSurface_Gpu::Valid to allow kRGBA_half_GrPixelConfig
render target without a color space needed for legacy blending on
Android.

Bug: b/62347704
Change-Id: Ibc6144e69c26cdbdcbf29348c4f612fb6b639e01
Reviewed-on: https://skia-review.googlesource.com/26143
Commit-Queue: Stan Iliev <stani@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/image/SkSurface_Raster.cpp

diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index 51b9487..3869487 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -63,7 +63,7 @@
             shift = 2;
             break;
         case kRGBA_F16_SkColorType:
-            if (!info.colorSpace() || !info.colorSpace()->gammaIsLinear()) {
+            if (info.colorSpace() && (!info.colorSpace()->gammaIsLinear())) {
                 return false;
             }
             shift = 3;