diff options
| author | 2016-10-28 17:21:45 -0400 | |
|---|---|---|
| committer | 2016-11-02 11:36:48 -0400 | |
| commit | c2f31df8b3b9a237e9abffc59c61804ad8495073 (patch) | |
| tree | 0a1c37a9d3a8557f679407dd1648d49345c498b6 /libs/hwui/GlopBuilder.cpp | |
| parent | 0863156efddcef3895bb175403c91b089be5e8dc (diff) | |
use SkBlendMode
skbug.com/5814
Test: compile only
Change-Id: Ibbaff43df1117b2ca77fd8f917f03d88cc476330
(cherry picked from commit 26edbcba8a2ed4cb300e7f87e679e3b73cec2772)
Diffstat (limited to 'libs/hwui/GlopBuilder.cpp')
| -rw-r--r-- | libs/hwui/GlopBuilder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/GlopBuilder.cpp b/libs/hwui/GlopBuilder.cpp index 3b5fc718a036..34e6d39c9104 100644 --- a/libs/hwui/GlopBuilder.cpp +++ b/libs/hwui/GlopBuilder.cpp @@ -257,7 +257,7 @@ void GlopBuilder::setFill(int color, float alphaScale, // If the blend mode cannot be implemented using shaders, fall // back to the default SrcOver blend mode instead if (CC_UNLIKELY(mCaches.extensions().hasFramebufferFetch())) { - mDescription.framebufferMode = (SkXfermode::Mode)mode; + mDescription.framebufferMode = mode; mDescription.swapSrcDst = (modeUsage == Blend::ModeOrderSwap::Swap); // blending in shader, don't enable } else { @@ -271,11 +271,11 @@ void GlopBuilder::setFill(int color, float alphaScale, if (colorFilter) { SkColor color; - SkXfermode::Mode xmode; + SkBlendMode bmode; SkScalar srcColorMatrix[20]; - if (colorFilter->asColorMode(&color, &xmode)) { + if (colorFilter->asColorMode(&color, &bmode)) { mOutGlop->fill.filterMode = mDescription.colorOp = ProgramDescription::ColorFilterMode::Blend; - mDescription.colorMode = xmode; + mDescription.colorMode = bmode; mOutGlop->fill.filter.color.set(color); } else if (colorFilter->asColorMatrix(srcColorMatrix)) { mOutGlop->fill.filterMode = mDescription.colorOp = ProgramDescription::ColorFilterMode::Matrix; |