diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-30 20:31:25 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-30 20:31:25 +0000 |
| commit | 6fc3c1fe428eaaa1581d32988354870cf005d03b (patch) | |
| tree | 78e6a679bd78bf668ee13fd0885fc396e82e26b5 /src/core/SkBlitter_ARGB32.cpp | |
| parent | e958c6949af2def03ae894917e81eab008116947 (diff) | |
Detect that we're drawing to a device that has per-pixel alpha, and if so,
disable LCD text.
Add experimental flag to force AA in fontscaler (windows-only). Hope to remove
this later.
git-svn-id: http://skia.googlecode.com/svn/trunk@2387 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBlitter_ARGB32.cpp')
| -rw-r--r-- | src/core/SkBlitter_ARGB32.cpp | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/src/core/SkBlitter_ARGB32.cpp b/src/core/SkBlitter_ARGB32.cpp index af55aba951..4e2916af0e 100644 --- a/src/core/SkBlitter_ARGB32.cpp +++ b/src/core/SkBlitter_ARGB32.cpp @@ -60,18 +60,16 @@ static void blit_lcd16_row(SkPMColor dst[], const uint16_t src[], maskG = maskG * srcA >> 8; maskB = maskB * srcA >> 8; - int maskA = SkMax32(SkMax32(maskR, maskG), maskB); - - int dstA = SkGetPackedA32(d); int dstR = SkGetPackedR32(d); int dstG = SkGetPackedG32(d); int dstB = SkGetPackedB32(d); - // nocheck version for now, until we cleanup GDI's garbage bits - dst[i] = SkPackARGB32NoCheck(blend32(0xFF, dstA, maskA), - blend32(srcR, dstR, maskR), - blend32(srcG, dstG, maskG), - blend32(srcB, dstB, maskB)); + // LCD blitting is only supported if the dst is known/required\ + // to be opaque + dst[i] = SkPackARGB32(0xFF, + blend32(srcR, dstR, maskR), + blend32(srcG, dstG, maskG), + blend32(srcB, dstB, maskB)); } } @@ -105,18 +103,16 @@ static void blit_lcd16_opaque_row(SkPMColor dst[], const uint16_t src[], maskG = upscale31To32(maskG); maskB = upscale31To32(maskB); - int maskA = SkMax32(SkMax32(maskR, maskG), maskB); - - int dstA = SkGetPackedA32(d); int dstR = SkGetPackedR32(d); int dstG = SkGetPackedG32(d); int dstB = SkGetPackedB32(d); - // nocheck version for now, until we cleanup GDI's garbage bits - dst[i] = SkPackARGB32NoCheck(blend32(0xFF, dstA, maskA), - blend32(srcR, dstR, maskR), - blend32(srcG, dstG, maskG), - blend32(srcB, dstB, maskB)); + // LCD blitting is only supported if the dst is known/required + // to be opaque + dst[i] = SkPackARGB32(0xFF, + blend32(srcR, dstR, maskR), + blend32(srcG, dstG, maskG), + blend32(srcB, dstB, maskB)); } } @@ -150,14 +146,13 @@ static void blit_lcd32_row(SkPMColor dst[], const uint32_t src[], maskG = maskG * srcA >> 8; maskB = maskB * srcA >> 8; - int maskA = SkMax32(SkMax32(maskR, maskG), maskB); - - int dstA = SkGetPackedA32(d); int dstR = SkGetPackedR32(d); int dstG = SkGetPackedG32(d); int dstB = SkGetPackedB32(d); - dst[i] = SkPackARGB32(SkAlphaBlend(0xFF, dstA, maskA), + // LCD blitting is only supported if the dst is known/required + // to be opaque + dst[i] = SkPackARGB32(0xFF, SkAlphaBlend(srcR, dstR, maskR), SkAlphaBlend(srcG, dstG, maskG), SkAlphaBlend(srcB, dstB, maskB)); |