diff options
| author |  Mike Reed <reed@google.com> | 2017-06-26 13:46:28 +0000 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2017-06-26 13:53:22 +0000 |
| commit | 5e78c610755dbc6d37a6045eeddb988a292894cb (patch) | |
| tree | 1d014a70126c990da9bb204c6a01283e600e7959 /src/core | |
| parent | 91d7d1d4ac7ca5e27f6caff24bed943baa9a3493 (diff) | |
Revert "remove a bit more dead code"
This reverts commit d9b1fe02a677ec44bc1c99809f3ee7eb08708137.
Reason for revert: try to fix chrome roll
Original change's description:
> remove a bit more dead code
>
> Change-Id: I61484672e88d6bb4f75833ee89e7178c4f34d610
> Reviewed-on: https://skia-review.googlesource.com/20780
> Commit-Queue: Mike Klein <mtklein@google.com>
> Reviewed-by: Herb Derby <herb@google.com>
TBR=mtklein@chromium.org,mtklein@google.com,herb@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I03dcd344dfb138261d9421b0692d12e4ed431100
Reviewed-on: https://skia-review.googlesource.com/20822
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkOpts.cpp | 3 | ||||
| -rw-r--r-- | src/core/SkOpts.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/core/SkOpts.cpp b/src/core/SkOpts.cpp index 2b7f1f2ed8..33c3690f4e 100644 --- a/src/core/SkOpts.cpp +++ b/src/core/SkOpts.cpp @@ -37,6 +37,7 @@ #endif #include "SkBitmapFilter_opts.h" +#include "SkBlend_opts.h" #include "SkBlitMask_opts.h" #include "SkBlitRow_opts.h" #include "SkBlurImageFilter_opts.h" @@ -79,6 +80,8 @@ namespace SkOpts { DEFINE_DEFAULT(inverted_CMYK_to_RGB1); DEFINE_DEFAULT(inverted_CMYK_to_BGR1); + DEFINE_DEFAULT(srcover_srgb_srgb); + DEFINE_DEFAULT(memset16); DEFINE_DEFAULT(memset32); DEFINE_DEFAULT(memset64); diff --git a/src/core/SkOpts.h b/src/core/SkOpts.h index 92d6f284ca..a4f1ea284c 100644 --- a/src/core/SkOpts.h +++ b/src/core/SkOpts.h @@ -49,6 +49,10 @@ namespace SkOpts { inverted_CMYK_to_RGB1, // i.e. convert color space inverted_CMYK_to_BGR1; // i.e. convert color space + // Blend ndst src pixels over dst, where both src and dst point to sRGB pixels (RGBA or BGRA). + // If nsrc < ndst, we loop over src to create a pattern. + extern void (*srcover_srgb_srgb)(uint32_t* dst, const uint32_t* src, int ndst, int nsrc); + extern void (*memset16)(uint16_t[], uint16_t, int); extern void (*memset32)(uint32_t[], uint32_t, int); extern void (*memset64)(uint64_t[], uint64_t, int); |