diff options
Diffstat (limited to 'src/effects/SkBlendImageFilter.cpp')
| -rw-r--r-- | src/effects/SkBlendImageFilter.cpp | 8 |
1 files changed, 4 insertions, 4 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: |