AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean up SK_LEGACY_OP_COLOR_AS_BYTES

Browse Source 
Change-Id: I5a63e8185060b78c9e038159bbd4e5288ee2539f
Reviewed-on: https://skia-review.googlesource.com/c/168881
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2018-11-06 18:54:08 -05:00 committed by Skia Commit-Bot
parent 987e76ccf6
commit 5c8d3e17ab
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/SkBlitter.cpp
View File

@ -774,13 +774,11 @@ bool SkBlitter::UseRasterPipelineBlitter(const SkPixmap& device, const SkPaint&
return true;
}
#ifndef SK_LEGACY_OP_COLOR_AS_BYTES
// All the real legacy fast paths are for shaders and SrcOver.
// Choosing SkRasterPipelineBlitter will also let us to hit its single-color memset path.
if (!paint.getShader() && paint.getBlendMode() != SkBlendMode::kSrcOver) {
return true;
}
#endif
// Only kN32 and 565 are handled by legacy blitters now, 565 mostly just for Android.
return device.colorType() != kN32_SkColorType
@ -848,16 +846,8 @@ SkBlitter* SkBlitter::Choose(const SkPixmap& device,
SkASSERT(device.colorType() == kN32_SkColorType ||
device.colorType() == kRGB_565_SkColorType);
#ifndef SK_LEGACY_OP_COLOR_AS_BYTES
// And we should either have a shader, be blending with SrcOver, or both.
SkASSERT(paint->getShader() || paint->getBlendMode() == SkBlendMode::kSrcOver);
#else
if (!paint->getShader() && paint->getBlendMode() != SkBlendMode::kSrcOver) {
// Only the SrcOver blitters can handle colors directly. Others need a shader.
paint.writable()->setShader(SkShader::MakeColorShader(paint->getColor()));
paint.writable()->setAlpha(0xFF);
}
#endif
// TODO: remove SkColorSpace from makeContext() arguments. It's always nullptr.
SkASSERT(!device.colorSpace());