Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: src/core/SkAAClip.cpp

Issue 728673002: remove unused kLCD_MaskFormat (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove associated Gr enum Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/gpu/GrTypes.h ('k') | src/core/SkBlitMask_D32.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkAAClip.cpp
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 58a16f3affd7dd628a5fe602fc9372e12fa61dcd..e2c1b12d07868378ade744445d8413382917d392 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -2046,6 +2046,7 @@ static void small_bzero(void* dst, size_t n) {
static inline uint8_t mergeOne(uint8_t value, unsigned alpha) {
return SkMulDiv255Round(value, alpha);
}
+
static inline uint16_t mergeOne(uint16_t value, unsigned alpha) {
unsigned r = SkGetPackedR16(value);
unsigned g = SkGetPackedG16(value);
@@ -2054,16 +2055,6 @@ static inline uint16_t mergeOne(uint16_t value, unsigned alpha) {
SkMulDiv255Round(g, alpha),
SkMulDiv255Round(b, alpha));
}
-static inline SkPMColor mergeOne(SkPMColor value, unsigned alpha) {
- unsigned a = SkGetPackedA32(value);
- unsigned r = SkGetPackedR32(value);
- unsigned g = SkGetPackedG32(value);
- unsigned b = SkGetPackedB32(value);
- return SkPackARGB32(SkMulDiv255Round(a, alpha),
- SkMulDiv255Round(r, alpha),
- SkMulDiv255Round(g, alpha),
- SkMulDiv255Round(b, alpha));
-}
template <typename T> void mergeT(const T* SK_RESTRICT src, int srcN,
const uint8_t* SK_RESTRICT row, int rowN,
@@ -2111,10 +2102,6 @@ static MergeAAProc find_merge_aa_proc(SkMask::Format format) {
void (*proc16)(const uint16_t*, int, const uint8_t*, int, uint16_t*) = mergeT;
return (MergeAAProc)proc16;
}
- case SkMask::kLCD32_Format: {
- void (*proc32)(const SkPMColor*, int, const uint8_t*, int, SkPMColor*) = mergeT;
- return (MergeAAProc)proc32;
- }
default:
SkDEBUGFAIL("unsupported");
return NULL;
« no previous file with comments | « include/gpu/GrTypes.h ('k') | src/core/SkBlitMask_D32.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698