Make SkColor4f <-> SkColor skip sRGB conversion
This lets us remove the old S32 functions, and fix a couple bugs.
I think this is a good first step to using SkColor4f for paint colors.
Bug: skia:
Change-Id: I0337c2b6db29b73c2f682f85b9cf68c985de7cce
Reviewed-on: https://skia-review.googlesource.com/147205
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/gm/colorspacexform.cpp b/gm/colorspacexform.cpp
deleted file mode 100644
index 72ea4ce..0000000
--- a/gm/colorspacexform.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "gm.h"
-#include "SkColor.h"
-#include "SkColorSpaceXform.h"
-#include "SkRect.h"
-#include "SkShader.h"
-
-class ColorSpaceXformGM : public skiagm::GM {
-public:
- ColorSpaceXformGM() {}
-
-protected:
- void onOnceBeforeDraw() override {
- SkColor colors[] = {
- SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorMAGENTA, SK_ColorCYAN, SK_ColorYELLOW,
- SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorMAGENTA,
- };
- static_assert(kNumColors == SK_ARRAY_COUNT(colors), "Fix number of colors.");
-
- for (int i = 0; i < kNumColors; i++) {
- fSRGBColors[i] = SkColor4f::FromColor(colors[i]);
- }
-
- static constexpr float kWideGamutRGB_toXYZD50[]{
- 0.7161046f, 0.1009296f, 0.1471858f,
- 0.2581874f, 0.7249378f, 0.0168748f,
- 0.0000000f, 0.0517813f, 0.7734287f,
- };
-
- SkMatrix44 wideGamut(SkMatrix44::kUninitialized_Constructor);
- wideGamut.set3x3RowMajorf(kWideGamutRGB_toXYZD50);
-
- // Test BGRA input.
- sk_sp<SkColorSpace> srcSpace = SkColorSpace::MakeSRGB();
- sk_sp<SkColorSpace> dstSpace =
- SkColorSpace::MakeRGB(SkColorSpace::kLinear_RenderTargetGamma, wideGamut);
- std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New(srcSpace.get(),
- dstSpace.get());
- xform->apply(SkColorSpaceXform::kRGBA_F32_ColorFormat, fWideGamutColors0,
- SkColorSpaceXform::kBGRA_8888_ColorFormat, colors, kNumColors,
- kOpaque_SkAlphaType);
-
- // Test F32 input.
- srcSpace = srcSpace->makeLinearGamma();
- xform = SkColorSpaceXform::New(srcSpace.get(), dstSpace.get());
- xform->apply(SkColorSpaceXform::kRGBA_F32_ColorFormat, fWideGamutColors1,
- SkColorSpaceXform::kRGBA_F32_ColorFormat, fSRGBColors, kNumColors,
- kOpaque_SkAlphaType);
- }
-
- SkString onShortName() override {
- return SkString("colorspacexform");
- }
-
- SkISize onISize() override {
- return SkISize::Make(500, 300);
- }
-
- void onDraw(SkCanvas* canvas) override {
- auto drawColors = [canvas](SkColor4f* colors) {
- SkRect r = SkRect::MakeXYWH(0.0f, 0.0f, 50.0f, 100.0f);
-
- canvas->save();
- for (int i = 0; i < kNumColors; i++) {
- auto space = SkColorSpace::MakeSRGBLinear();
- sk_sp<SkShader> s = SkShader::MakeColorShader(colors[i], space);
- SkPaint paint;
- paint.setShader(s);
- canvas->drawRect(r, paint);
- canvas->translate(50.0f, 0.0f);
- }
- canvas->restore();
- };
-
- // Wide gamut colors should appear darker - we are simulating a more intense display.
- drawColors(fSRGBColors);
- canvas->translate(0.0f, 100.0f);
- drawColors(fWideGamutColors0);
- canvas->translate(0.0f, 100.0f);
- drawColors(fWideGamutColors1);
- }
-
-private:
- static constexpr int kNumColors = 10;
-
- SkColor4f fSRGBColors[kNumColors];
- SkColor4f fWideGamutColors0[kNumColors];
- SkColor4f fWideGamutColors1[kNumColors];
-
- typedef skiagm::GM INHERITED;
-};
-
-DEF_GM(return new ColorSpaceXformGM;)
diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp
index 6993642..2538e6e 100644
--- a/gm/encode-srgb.cpp
+++ b/gm/encode-srgb.cpp
@@ -16,7 +16,6 @@
#include "SkJpegEncoder.h"
#include "SkPngEncoder.h"
#include "SkPM4f.h"
-#include "SkSRGB.h"
#include "SkWebpEncoder.h"
namespace skiagm {
diff --git a/gm/hsl.cpp b/gm/hsl.cpp
index 39074e2..a4c9657 100644
--- a/gm/hsl.cpp
+++ b/gm/hsl.cpp
@@ -130,35 +130,17 @@
}
static SkColor blend(SkColor dst, SkColor src,
- void (*mode)(float,float,float, float*,float*,float*),
- bool legacy) {
+ void (*mode)(float,float,float, float*,float*,float*)) {
SkASSERT(SkColorGetA(dst) == 0xff
&& SkColorGetA(src) == 0xff); // Not fundamental, just simplifying for this GM.
- auto to_float = [&](SkColor c) {
- if (legacy) {
- return SkColor4f{
- SkColorGetR(c) * (1/255.0f),
- SkColorGetG(c) * (1/255.0f),
- SkColorGetB(c) * (1/255.0f),
- 1.0f,
- };
- }
- return SkColor4f::FromColor(c);
- };
-
- SkColor4f d = to_float(dst),
- s = to_float(src);
+ SkColor4f d = SkColor4f::FromColor(dst),
+ s = SkColor4f::FromColor(src);
mode( d.fR, d.fG, d.fB,
&s.fR, &s.fG, &s.fB);
- if (legacy) {
- return SkColorSetRGB(s.fR * 255.0f + 0.5f,
- s.fG * 255.0f + 0.5f,
- s.fB * 255.0f + 0.5f);
- }
return s.toSkColor();
}
@@ -186,7 +168,6 @@
{ SkBlendMode::kColor, color },
{ SkBlendMode::kLuminosity, luminosity },
};
- bool legacy = !canvas->imageInfo().colorSpace();
for (auto test : tests) {
canvas->drawRect({20,20,80,80}, bg);
@@ -195,7 +176,7 @@
if (test.reference) {
SkPaint ref;
- ref.setColor(blend(bg.getColor(), fg.getColor(), test.reference, legacy));
+ ref.setColor(blend(bg.getColor(), fg.getColor(), test.reference));
canvas->drawCircle(50,50, 20, ref);
}
diff --git a/gn/gm.gni b/gn/gm.gni
index 7dcfe07..f6aa416 100644
--- a/gn/gm.gni
+++ b/gn/gm.gni
@@ -79,7 +79,6 @@
"$_gm/colorfilterimagefilter.cpp",
"$_gm/colorfilters.cpp",
"$_gm/colormatrix.cpp",
- "$_gm/colorspacexform.cpp",
"$_gm/colorwheel.cpp",
"$_gm/complexclip.cpp",
"$_gm/complexclip_blur_tiled.cpp",
diff --git a/src/core/SkColor.cpp b/src/core/SkColor.cpp
index 6c9f009..0388277 100644
--- a/src/core/SkColor.cpp
+++ b/src/core/SkColor.cpp
@@ -153,12 +153,12 @@
SkColor4f SkColor4f::FromColor(SkColor bgra) {
SkColor4f rgba;
- swizzle_rb(Sk4f_fromS32(bgra)).store(rgba.vec());
+ swizzle_rb(Sk4f_fromL32(bgra)).store(rgba.vec());
return rgba;
}
SkColor SkColor4f::toSkColor() const {
- return Sk4f_toS32(swizzle_rb(Sk4f::Load(this->vec())));
+ return Sk4f_toL32(swizzle_rb(Sk4f::Load(this->vec())));
}
SkColor4f SkColor4f::Pin(float r, float g, float b, float a) {
diff --git a/src/core/SkPM4fPriv.h b/src/core/SkPM4fPriv.h
index 9505415..6dbc535 100644
--- a/src/core/SkPM4fPriv.h
+++ b/src/core/SkPM4fPriv.h
@@ -15,7 +15,6 @@
#include "SkArenaAlloc.h"
#include "SkPM4f.h"
#include "SkRasterPipeline.h"
-#include "SkSRGB.h"
#include "../jumper/SkJumper.h"
// This file is mostly helper routines for doing color space management.
@@ -63,24 +62,4 @@
return premul_in_dst_colorspace(color4f, sk_srgb_singleton(), dstCS);
}
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// Functions below this line are probably totally broken as far as color space management goes.
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-static inline Sk4f Sk4f_fromS32(uint32_t px) {
- return { sk_linear_from_srgb[(px >> 0) & 0xff],
- sk_linear_from_srgb[(px >> 8) & 0xff],
- sk_linear_from_srgb[(px >> 16) & 0xff],
- (1/255.0f) * (px >> 24) };
-}
-
-static inline uint32_t Sk4f_toS32(const Sk4f& px) {
- Sk4i rgb = sk_linear_to_srgb(px),
- srgb = { rgb[0], rgb[1], rgb[2], (int)(255.0f * px[3] + 0.5f) };
-
- uint32_t s32;
- SkNx_cast<uint8_t>(srgb).store(&s32);
- return s32;
-}
-
#endif
diff --git a/src/core/SkSRGB.cpp b/src/core/SkSRGB.cpp
index 327c7d8..f32f854 100644
--- a/src/core/SkSRGB.cpp
+++ b/src/core/SkSRGB.cpp
@@ -7,73 +7,6 @@
#include "SkSRGB.h"
-const float sk_linear_from_srgb[256] = {
- 0.000000000000000000f, 0.000303526983548838f, 0.000607053967097675f, 0.000910580950646513f,
- 0.001214107934195350f, 0.001517634917744190f, 0.001821161901293030f, 0.002124688884841860f,
- 0.002428215868390700f, 0.002731742851939540f, 0.003034518678424960f, 0.003346535763899160f,
- 0.003676507324047440f, 0.004024717018496310f, 0.004391442037410290f, 0.004776953480693730f,
- 0.005181516702338390f, 0.005605391624202720f, 0.006048833022857060f, 0.006512090792594470f,
- 0.006995410187265390f, 0.007499032043226180f, 0.008023192985384990f, 0.008568125618069310f,
- 0.009134058702220790f, 0.009721217320237850f, 0.010329823029626900f, 0.010960094006488200f,
- 0.011612245179743900f, 0.012286488356915900f, 0.012983032342173000f, 0.013702083047289700f,
- 0.014443843596092500f, 0.015208514422912700f, 0.015996293365509600f, 0.016807375752887400f,
- 0.017641954488384100f, 0.018500220128379700f, 0.019382360956935700f, 0.020288563056652400f,
- 0.021219010376003600f, 0.022173884793387400f, 0.023153366178110400f, 0.024157632448504800f,
- 0.025186859627361600f, 0.026241221894849900f, 0.027320891639074900f, 0.028426039504420800f,
- 0.029556834437808800f, 0.030713443732993600f, 0.031896033073011500f, 0.033104766570885100f,
- 0.034339806808682200f, 0.035601314875020300f, 0.036889450401100000f, 0.038204371595346500f,
- 0.039546235276732800f, 0.040915196906853200f, 0.042311410620809700f, 0.043735029256973500f,
- 0.045186204385675500f, 0.046665086336880100f, 0.048171824226889400f, 0.049706565984127200f,
- 0.051269458374043200f, 0.052860647023180200f, 0.054480276442442400f, 0.056128490049600100f,
- 0.057805430191067200f, 0.059511238162981200f, 0.061246054231617600f, 0.063010017653167700f,
- 0.064803266692905800f, 0.066625938643772900f, 0.068478169844400200f, 0.070360095696595900f,
- 0.072271850682317500f, 0.074213568380149600f, 0.076185381481307900f, 0.078187421805186300f,
- 0.080219820314468300f, 0.082282707129814800f, 0.084376211544148800f, 0.086500462036549800f,
- 0.088655586285772900f, 0.090841711183407700f, 0.093058962846687500f, 0.095307466630964700f,
- 0.097587347141862500f, 0.099898728247113900f, 0.102241733088101000f, 0.104616484091104000f,
- 0.107023102978268000f, 0.109461710778299000f, 0.111932427836906000f, 0.114435373826974000f,
- 0.116970667758511000f, 0.119538427988346000f, 0.122138772229602000f, 0.124771817560950000f,
- 0.127437680435647000f, 0.130136476690364000f, 0.132868321553818000f, 0.135633329655206000f,
- 0.138431615032452000f, 0.141263291140272000f, 0.144128470858058000f, 0.147027266497595000f,
- 0.149959789810609000f, 0.152926151996150000f, 0.155926463707827000f, 0.158960835060880000f,
- 0.162029375639111000f, 0.165132194501668000f, 0.168269400189691000f, 0.171441100732823000f,
- 0.174647403655585000f, 0.177888415983629000f, 0.181164244249860000f, 0.184474994500441000f,
- 0.187820772300678000f, 0.191201682740791000f, 0.194617830441576000f, 0.198069319559949000f,
- 0.201556253794397000f, 0.205078736390317000f, 0.208636870145256000f, 0.212230757414055000f,
- 0.215860500113899000f, 0.219526199729269000f, 0.223227957316809000f, 0.226965873510098000f,
- 0.230740048524349000f, 0.234550582161005000f, 0.238397573812271000f, 0.242281122465555000f,
- 0.246201326707835000f, 0.250158284729953000f, 0.254152094330827000f, 0.258182852921596000f,
- 0.262250657529696000f, 0.266355604802862000f, 0.270497791013066000f, 0.274677312060385000f,
- 0.278894263476810000f, 0.283148740429992000f, 0.287440837726918000f, 0.291770649817536000f,
- 0.296138270798321000f, 0.300543794415777000f, 0.304987314069886000f, 0.309468922817509000f,
- 0.313988713375718000f, 0.318546778125092000f, 0.323143209112951000f, 0.327778098056542000f,
- 0.332451536346179000f, 0.337163615048330000f, 0.341914424908661000f, 0.346704056355030000f,
- 0.351532599500439000f, 0.356400144145944000f, 0.361306779783510000f, 0.366252595598840000f,
- 0.371237680474149000f, 0.376262122990906000f, 0.381326011432530000f, 0.386429433787049000f,
- 0.391572477749723000f, 0.396755230725627000f, 0.401977779832196000f, 0.407240211901737000f,
- 0.412542613483904000f, 0.417885070848138000f, 0.423267669986072000f, 0.428690496613907000f,
- 0.434153636174749000f, 0.439657173840919000f, 0.445201194516228000f, 0.450785782838223000f,
- 0.456411023180405000f, 0.462076999654407000f, 0.467783796112159000f, 0.473531496148010000f,
- 0.479320183100827000f, 0.485149940056070000f, 0.491020849847836000f, 0.496932995060870000f,
- 0.502886458032569000f, 0.508881320854934000f, 0.514917665376521000f, 0.520995573204354000f,
- 0.527115125705813000f, 0.533276404010505000f, 0.539479489012107000f, 0.545724461370187000f,
- 0.552011401512000000f, 0.558340389634268000f, 0.564711505704929000f, 0.571124829464873000f,
- 0.577580440429651000f, 0.584078417891164000f, 0.590618840919337000f, 0.597201788363763000f,
- 0.603827338855338000f, 0.610495570807865000f, 0.617206562419651000f, 0.623960391675076000f,
- 0.630757136346147000f, 0.637596873994033000f, 0.644479681970582000f, 0.651405637419824000f,
- 0.658374817279448000f, 0.665387298282272000f, 0.672443156957688000f, 0.679542469633094000f,
- 0.686685312435314000f, 0.693871761291990000f, 0.701101891932973000f, 0.708375779891687000f,
- 0.715693500506481000f, 0.723055128921969000f, 0.730460740090354000f, 0.737910408772731000f,
- 0.745404209540387000f, 0.752942216776078000f, 0.760524504675292000f, 0.768151147247507000f,
- 0.775822218317423000f, 0.783537791526194000f, 0.791297940332630000f, 0.799102738014409000f,
- 0.806952257669252000f, 0.814846572216101000f, 0.822785754396284000f, 0.830769876774655000f,
- 0.838799011740740000f, 0.846873231509858000f, 0.854992608124234000f, 0.863157213454102000f,
- 0.871367119198797000f, 0.879622396887832000f, 0.887923117881966000f, 0.896269353374266000f,
- 0.904661174391149000f, 0.913098651793419000f, 0.921581856277295000f, 0.930110858375424000f,
- 0.938685728457888000f, 0.947306536733200000f, 0.955973353249286000f, 0.964686247894465000f,
- 0.973445290398413000f, 0.982250550333117000f, 0.991102097113830000f, 1.000000000000000000f,
-};
-
/*
* Converts sRGB encoded bytes to a 12-bit linear representation.
*/
diff --git a/src/core/SkSRGB.h b/src/core/SkSRGB.h
index de078a5..a1de863 100644
--- a/src/core/SkSRGB.h
+++ b/src/core/SkSRGB.h
@@ -8,7 +8,7 @@
#ifndef SkSRGB_DEFINED
#define SkSRGB_DEFINED
-#include "SkNx.h"
+#include "SkTypes.h"
/** Components for building our canonical sRGB -> linear and linear -> sRGB transformations.
*
@@ -20,33 +20,7 @@
* sk_linear_to_srgb() will run a little faster than usual when compiled with SSE4.1+.
*/
-extern const float sk_linear_from_srgb[256];
extern const uint16_t sk_linear12_from_srgb[256];
extern const uint8_t sk_linear12_to_srgb[4096];
-// [0.0f, 1.0f] -> [0, 255].
-static inline Sk4i sk_linear_to_srgb(const Sk4f& x) {
- // Approximation of the sRGB gamma curve (within 1 when scaled to 8-bit pixels).
- //
- // Constants tuned by brute force to minimize (in order of importance) after truncation:
- // 1) the number of bytes that fail to round trip (0 of 256);
- // 2) the number of points in [FLT_MIN, 1.0f] that are non-monotonic (0 of ~1 billion);
- // 3) the number of points halfway between bytes that hit the wrong byte (131 of 255).
- auto rsqrt = x.rsqrt(),
- sqrt = rsqrt.invert(),
- ftrt = rsqrt.rsqrt();
-
- auto lo = (13.0471f * 255.0f) * x;
-
- auto hi = SkNx_fma(Sk4f{+0.412999f * 255.0f}, ftrt,
- SkNx_fma(Sk4f{+0.687999f * 255.0f}, sqrt,
- Sk4f{-0.0974983f * 255.0f}));
- auto s = (x < 0.0048f).thenElse(lo, hi);
-
- // Now clamp and truncate.
- // The order of the arguments is important here. We want to make sure that NaN
- // clamps to zero. Note that max(NaN, 0) = 0, while max(0, NaN) = NaN.
- return SkNx_cast<int>(Sk4f::Min(Sk4f::Max(s, 0.0f), 255.0f));
-}
-
#endif//SkSRGB_DEFINED
diff --git a/tests/SRGBTest.cpp b/tests/SRGBTest.cpp
index 44daeda..83d6d36 100644
--- a/tests/SRGBTest.cpp
+++ b/tests/SRGBTest.cpp
@@ -7,40 +7,11 @@
#include "SkPM4f.h"
#include "SkRasterPipeline.h"
-#include "SkSRGB.h"
#include "SkTypes.h"
#include "Test.h"
#include <math.h>
#include "../src/jumper/SkJumper.h"
-static uint8_t linear_to_srgb(float l) {
- return (uint8_t)sk_linear_to_srgb(Sk4f{l})[0];
-}
-
-DEF_TEST(sk_linear_to_srgb, r) {
- // All bytes should round trip.
- for (int i = 0; i < 256; i++) {
- int actual = linear_to_srgb(sk_linear_from_srgb[i]);
- if (i != actual) {
- ERRORF(r, "%d -> %d\n", i, actual);
- }
- }
-
- // Should be monotonic between 0 and 1.
- uint8_t prev = 0;
- for (float f = FLT_MIN; f <= 1.0f; ) { // We don't bother checking denorm values.
- uint8_t srgb = linear_to_srgb(f);
-
- REPORTER_ASSERT(r, srgb >= prev);
- prev = srgb;
-
- union { float flt; uint32_t bits; } pun = { f };
- pun.bits++;
- SkDEBUGCODE(pun.bits += 127);
- f = pun.flt;
- }
-}
-
DEF_TEST(sk_pipeline_srgb_roundtrip, r) {
uint32_t reds[256];
for (int i = 0; i < 256; i++) {