AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix color order on LCD text when using sRGB software backend.

Browse Source 
BUG=skia:5182
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2166533002

Review-Url: https://codereview.chromium.org/2166533002
This commit is contained in:
mtklein 2016-07-19 12:59:35 -07:00 committed by Commit bot
parent 523e76d279
commit 35f255f0f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/SkXfermode4f.cpp
View File

@ -441,7 +441,7 @@ static Sk4f lcd16_to_unit_4f(uint16_t rgb) {
template <DstType D> template <DstType D>
void src_1_lcd(uint32_t dst[], const SkPM4f* src, int count, const uint16_t lcd[]) { void src_1_lcd(uint32_t dst[], const SkPM4f* src, int count, const uint16_t lcd[]) {
const Sk4f s4 = Sk4f::Load(src->fVec); const Sk4f s4 = src->to4f_pmorder();
if (D == kLinear_Dst) { if (D == kLinear_Dst) {
// operate in bias-255 space for src and dst // operate in bias-255 space for src and dst
@ -473,7 +473,7 @@ void src_n_lcd(uint32_t dst[], const SkPM4f src[], int count, const uint16_t lcd
if (0 == rgb) { if (0 == rgb) {
continue; continue;
} }
Sk4f s4 = Sk4f::Load(src[i].fVec); Sk4f s4 = src[i].to4f_pmorder();
Sk4f d4 = load_dst<D>(dst[i]); Sk4f d4 = load_dst<D>(dst[i]);
dst[i] = store_dst<D>(lerp(s4, d4, lcd16_to_unit_4f(rgb))) | (SK_A32_MASK << SK_A32_SHIFT); dst[i] = store_dst<D>(lerp(s4, d4, lcd16_to_unit_4f(rgb))) | (SK_A32_MASK << SK_A32_SHIFT);
} }
@ -481,7 +481,7 @@ void src_n_lcd(uint32_t dst[], const SkPM4f src[], int count, const uint16_t lcd
template <DstType D> template <DstType D>
void srcover_1_lcd(uint32_t dst[], const SkPM4f* src, int count, const uint16_t lcd[]) { void srcover_1_lcd(uint32_t dst[], const SkPM4f* src, int count, const uint16_t lcd[]) {
const Sk4f s4 = Sk4f::Load(src->fVec); const Sk4f s4 = src->to4f_pmorder();
Sk4f dst_scale = Sk4f(1 - get_alpha(s4)); Sk4f dst_scale = Sk4f(1 - get_alpha(s4));
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
@ -503,7 +503,7 @@ void srcover_n_lcd(uint32_t dst[], const SkPM4f src[], int count, const uint16_t
if (0 == rgb) { if (0 == rgb) {
continue; continue;
} }
Sk4f s4 = Sk4f::Load(src[i].fVec); Sk4f s4 = src[i].to4f_pmorder();
Sk4f dst_scale = Sk4f(1 - get_alpha(s4)); Sk4f dst_scale = Sk4f(1 - get_alpha(s4));
Sk4f d4 = load_dst<D>(dst[i]); Sk4f d4 = load_dst<D>(dst[i]);
Sk4f r4 = s4 + d4 * dst_scale; Sk4f r4 = s4 + d4 * dst_scale;