From 43d6651111374b5d1e4ddd9030dcf079b448ec47 Mon Sep 17 00:00:00 2001 From: msarett Date: Fri, 16 Sep 2016 09:51:12 -0700 Subject: Support Float32 output from SkColorSpaceXform * Adds Float32 support to SkColorSpaceXform * Changes API to allows clients to ask for F32, updates clients to new API * Adds Sk4f_load4 and Sk4f_store4 to SkNx * Make use of new xform in SkGr.cpp BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339233003 CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot Review-Url: https://codereview.chromium.org/2339233003 --- src/gpu/SkGr.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/gpu/SkGr.cpp') diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index c8839f3f1a..86b1007ba5 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -23,6 +23,7 @@ #include "SkColorFilter.h" #include "SkConfig8888.h" #include "SkCanvas.h" +#include "SkColorSpaceXform.h" #include "SkData.h" #include "SkErrorInternals.h" #include "SkMessageBus.h" @@ -529,18 +530,20 @@ static inline bool skpaint_to_grpaint_impl(GrContext* context, grPaint->setAntiAlias(skPaint.isAntiAlias()); grPaint->setAllowSRGBInputs(dc->isGammaCorrect()); - // Raw translation of the SkPaint color to our 4f format: - GrColor4f origColor = GrColor4f::FromGrColor(SkColorToUnpremulGrColor(skPaint.getColor())); + GrColor4f origColor; // Linearize, if the color is meant to be in sRGB gamma: if (dc->isGammaCorrect()) { - origColor.fRGBA[0] = exact_srgb_to_linear(origColor.fRGBA[0]); - origColor.fRGBA[1] = exact_srgb_to_linear(origColor.fRGBA[1]); - origColor.fRGBA[2] = exact_srgb_to_linear(origColor.fRGBA[2]); + SkColorSpaceXform* xform = dc->getColorXformFromSRGB(); + SkASSERT(xform); - if (dc->getColorXformFromSRGB()) { - origColor = dc->getColorXformFromSRGB()->apply(origColor); - } + // FIXME (msarett): Support BGRA inputs to SkColorSpaceXform? + uint32_t rgba = SkSwizzle_RB(skPaint.getColor()); + xform->apply(&origColor, &rgba, 1, SkColorSpaceXform::kRGBA_F32_ColorFormat, + kUnpremul_SkAlphaType); + } else { + // Raw translation of the SkPaint color to our 4f format: + origColor = GrColor4f::FromGrColor(SkColorToUnpremulGrColor(skPaint.getColor())); } // Setup the initial color considering the shader, the SkPaint color, and the presence or not -- cgit v1.2.3