diff options
author | robertphillips <robertphillips@google.com> | 2016-03-31 10:27:26 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-31 10:27:26 -0700 |
commit | ca9206e10fbbee0e8f8d2df76743ffe3a38cef71 (patch) | |
tree | 4f084bda4f06bfcd0ae77df97369d3abe5bb1fee /src/core/SkLinearBitmapPipeline.cpp | |
parent | 3e4616ff10fad7ee7dae48f465223b4591ec8ffd (diff) |
Revert of Add unit repeat tiler (patchset #4 id:60001 of https://codereview.chromium.org/1837893004/ )
Reason for revert:
ASAN bot failures
Original issue's description:
> Add unit repeat tiler.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1837893004
>
> Committed: https://skia.googlesource.com/skia/+/865a289bfec169cb19970c734e9aa855c267f060
TBR=mtklein@google.com,fmalita@chromium.org,herb@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1844713005
Diffstat (limited to 'src/core/SkLinearBitmapPipeline.cpp')
-rw-r--r-- | src/core/SkLinearBitmapPipeline.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/core/SkLinearBitmapPipeline.cpp b/src/core/SkLinearBitmapPipeline.cpp index 59960ebcb7..4e4226a320 100644 --- a/src/core/SkLinearBitmapPipeline.cpp +++ b/src/core/SkLinearBitmapPipeline.cpp @@ -238,12 +238,6 @@ public: processor->breakIntoEdges(span); } - void repeatSpan(Span span, int32_t repeatCount) { - while (repeatCount --> 0) { - processor->pointSpan(span); - } - } - BilerpTileStage* processor; }; @@ -370,21 +364,13 @@ static SkLinearBitmapPipeline::PointProcessorInterface* choose_tiler( SkShader::TileMode xMode, SkShader::TileMode yMode, SkFilterQuality filterQuality, - SkScalar dx, - SkLinearBitmapPipeline::TileStage* tileStage) -{ + SkLinearBitmapPipeline::TileStage* tileStage) { switch (xMode) { case SkShader::kClamp_TileMode: choose_tiler_ymode<XClampStrategy>(yMode, filterQuality, dimensions, next, tileStage); break; case SkShader::kRepeat_TileMode: - if (dx == 1.0f && filterQuality == kNone_SkFilterQuality) { - choose_tiler_ymode<XRepeatUnitScaleStrategy>( - yMode, kNone_SkFilterQuality, dimensions, next, tileStage); - } else { - choose_tiler_ymode<XRepeatStrategy>( - yMode, filterQuality, dimensions, next, tileStage); - } + choose_tiler_ymode<XRepeatStrategy>(yMode, filterQuality, dimensions, next, tileStage); break; case SkShader::kMirror_TileMode: choose_tiler_ymode<XMirrorStrategy>(yMode, filterQuality, dimensions, next, tileStage); @@ -602,8 +588,6 @@ SkLinearBitmapPipeline::SkLinearBitmapPipeline( } } - SkScalar dx = adjustedInverse.getScaleX(); - // If it is an index 8 color type, the sampler converts to unpremul for better fidelity. SkAlphaType alphaType = srcImageInfo.alphaType(); if (srcPixmap.colorType() == kIndex_8_SkColorType) { @@ -616,7 +600,7 @@ SkLinearBitmapPipeline::SkLinearBitmapPipeline( auto samplerStage = choose_pixel_sampler(placementStage, filterQuality, srcPixmap, &fSampleStage); auto tilerStage = choose_tiler(samplerStage, - dimensions, xTile, yTile, filterQuality, dx, &fTiler); + dimensions, xTile, yTile, filterQuality, &fTiler); fFirstStage = choose_matrix(tilerStage, adjustedInverse, &fMatrixStage); } |