diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-30 21:36:11 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-30 21:36:11 +0000 |
| commit | 8d3cd7a170c810e3816bf00220cbef51e7b16795 (patch) | |
| tree | 6a76204c1d68934976e1542fc05e82d5a130a6b0 /src/effects | |
| parent | 118c1a70c7e8f9733d406cf69de9a5970b3ceb01 (diff) | |
Review URL: https://codereview.appspot.com/7232062
git-svn-id: http://skia.googlecode.com/svn/trunk@7476 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkBlendImageFilter.cpp | 8 | ||||
| -rw-r--r-- | src/effects/SkPorterDuff.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp index 775eba6e8d..46f25648fa 100644 --- a/src/effects/SkBlendImageFilter.cpp +++ b/src/effects/SkBlendImageFilter.cpp @@ -24,8 +24,8 @@ SkXfermode::Mode modeToXfermode(SkBlendImageFilter::Mode mode) switch (mode) { case SkBlendImageFilter::kNormal_Mode: return SkXfermode::kSrcOver_Mode; - case SkBlendImageFilter::kMultiply_Mode: - return SkXfermode::kMultiply_Mode; + case SkBlendImageFilter::kModulate_Mode: + return SkXfermode::kModulate_Mode; case SkBlendImageFilter::kScreen_Mode: return SkXfermode::kScreen_Mode; case SkBlendImageFilter::kDarken_Mode: @@ -100,7 +100,7 @@ bool SkBlendImageFilter::onFilterImage(Proxy* proxy, // FEBlend's multiply mode is (1 - Sa) * Da + (1 - Da) * Sc + Sc * Dc // Skia's is just Sc * Dc. So we use a custom proc to implement FEBlend's // version. - if (fMode == SkBlendImageFilter::kMultiply_Mode) { + if (fMode == SkBlendImageFilter::kModulate_Mode) { paint.setXfermode(new SkProcXfermode(multiply_proc))->unref(); } else { paint.setXfermodeMode(modeToXfermode(fMode)); @@ -283,7 +283,7 @@ void GrGLBlendEffect::emitCode(GrGLShaderBuilder* builder, case SkBlendImageFilter::kNormal_Mode: code->appendf("\t\t%s.rgb = (1.0 - %s.a) * %s.rgb + %s.rgb;\n", outputColor, fgColor, bgColor, fgColor); break; - case SkBlendImageFilter::kMultiply_Mode: + case SkBlendImageFilter::kModulate_Mode: code->appendf("\t\t%s.rgb = (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb + %s.rgb * %s.rgb;\n", outputColor, fgColor, bgColor, bgColor, fgColor, fgColor, bgColor); break; case SkBlendImageFilter::kScreen_Mode: diff --git a/src/effects/SkPorterDuff.cpp b/src/effects/SkPorterDuff.cpp index 4dc9783d2b..816ddae04b 100644 --- a/src/effects/SkPorterDuff.cpp +++ b/src/effects/SkPorterDuff.cpp @@ -36,7 +36,7 @@ static const struct Pair { MAKE_PAIR(Xor), MAKE_PAIR(Darken), MAKE_PAIR(Lighten), - MAKE_PAIR(Multiply), + MAKE_PAIR(Modulate), MAKE_PAIR(Screen), { SkPorterDuff::kAdd_Mode, SkXfermode::kPlus_Mode }, #ifdef SK_BUILD_FOR_ANDROID |