diff options
| -rw-r--r-- | src/core/SkPM4fPriv.h | 2 | ||||
| -rw-r--r-- | src/core/SkXfermode4f.cpp | 8 | ||||
| -rw-r--r-- | src/effects/gradients/Sk4fLinearGradient.cpp | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/core/SkPM4fPriv.h b/src/core/SkPM4fPriv.h index 9650646d95..bf5ff5a1ad 100644 --- a/src/core/SkPM4fPriv.h +++ b/src/core/SkPM4fPriv.h @@ -41,7 +41,7 @@ static inline Sk4f srgb_to_linear(const Sk4f& s4) { } static inline Sk4f linear_to_srgb(const Sk4f& l4) { - return set_alpha(l4.sqrt(), get_alpha(l4)); + return set_alpha(l4.rsqrt().invert(), get_alpha(l4)); } static inline float srgb_to_linear(float x) { diff --git a/src/core/SkXfermode4f.cpp b/src/core/SkXfermode4f.cpp index 4d224ac0ad..8671df7b2f 100644 --- a/src/core/SkXfermode4f.cpp +++ b/src/core/SkXfermode4f.cpp @@ -68,10 +68,10 @@ static Sk4x4f load_4_srgb(const void* ptr) { // Store an Sk4x4f back to 4 interlaced 8888 sRGB pixels. static void store_4_srgb(void* ptr, const Sk4x4f& p) { // Convert back to sRGB and [0,255], again approximating sRGB as gamma == 2. - auto r = p.r.sqrt() * 255.0f + 0.5f, - g = p.g.sqrt() * 255.0f + 0.5f, - b = p.b.sqrt() * 255.0f + 0.5f, - a = p.a * 255.0f + 0.5f; + auto r = p.r.rsqrt().invert() * 255.0f + 0.5f, + g = p.g.rsqrt().invert() * 255.0f + 0.5f, + b = p.b.rsqrt().invert() * 255.0f + 0.5f, + a = p.a * 255.0f + 0.5f; Sk4x4f{r,g,b,a}.transpose((uint8_t*)ptr); } diff --git a/src/effects/gradients/Sk4fLinearGradient.cpp b/src/effects/gradients/Sk4fLinearGradient.cpp index 090bdaa835..ca0ca6da60 100644 --- a/src/effects/gradients/Sk4fLinearGradient.cpp +++ b/src/effects/gradients/Sk4fLinearGradient.cpp @@ -53,7 +53,12 @@ void ramp<DstType::S32, ApplyPremul::False>(const Sk4f& c, const Sk4f& dc, SkPMC Sk4x4f c4x = Sk4x4f::Transpose(c, c + dc, c + dc * 2, c + dc * 3); while (n >= 4) { - const Sk4x4f cx4s32 = { c4x.r.sqrt(), c4x.g.sqrt(), c4x.b.sqrt(), c4x.a }; + const Sk4x4f cx4s32 = { + c4x.r.rsqrt().invert(), + c4x.g.rsqrt().invert(), + c4x.b.rsqrt().invert(), + c4x.a + }; cx4s32.transpose((uint8_t*)dst); c4x.r += dc4x.r; |