diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkColorFilter.cpp | 2 | ||||
-rw-r--r-- | src/core/SkColorSpaceXform.cpp | 2 | ||||
-rw-r--r-- | src/core/SkColorSpaceXform_A2B.cpp | 2 | ||||
-rw-r--r-- | src/core/SkConvertPixels.cpp | 2 | ||||
-rw-r--r-- | src/core/SkPM4fPriv.h | 2 | ||||
-rw-r--r-- | src/core/SkRasterPipeline.h | 4 | ||||
-rw-r--r-- | src/core/SkRasterPipelineBlitter.cpp | 20 |
7 files changed, 17 insertions, 17 deletions
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp index 65b5c45308..a0b03c4210 100644 --- a/src/core/SkColorFilter.cpp +++ b/src/core/SkColorFilter.cpp @@ -65,7 +65,7 @@ SkColor4f SkColorFilter::filterColor4f(const SkColor4f& c) const { this->onAppendStages(&pipeline, nullptr, &alloc, c.fA == 1); SkPM4f* dstPtr = &dst; pipeline.append(SkRasterPipeline::store_f32, &dstPtr); - pipeline.run(0,1); + pipeline.run(0,0, 1); return dst.unpremul(); } diff --git a/src/core/SkColorSpaceXform.cpp b/src/core/SkColorSpaceXform.cpp index 0749aa40e6..8887bc279f 100644 --- a/src/core/SkColorSpaceXform.cpp +++ b/src/core/SkColorSpaceXform.cpp @@ -1313,7 +1313,7 @@ bool SkColorSpaceXform_XYZ<kCSM> return false; } - pipeline.run(0, len); + pipeline.run(0,0, len); return true; } diff --git a/src/core/SkColorSpaceXform_A2B.cpp b/src/core/SkColorSpaceXform_A2B.cpp index 1cbf411784..2e710f5cca 100644 --- a/src/core/SkColorSpaceXform_A2B.cpp +++ b/src/core/SkColorSpaceXform_A2B.cpp @@ -75,7 +75,7 @@ bool SkColorSpaceXform_A2B::onApply(ColorFormat dstFormat, void* dst, ColorForma default: return false; } - pipeline.run(0,count); + pipeline.run(0,0, count); return true; } diff --git a/src/core/SkConvertPixels.cpp b/src/core/SkConvertPixels.cpp index 1c201a704e..2ada61f14e 100644 --- a/src/core/SkConvertPixels.cpp +++ b/src/core/SkConvertPixels.cpp @@ -397,7 +397,7 @@ static void convert_with_pipeline(const SkImageInfo& dstInfo, void* dstRow, size auto run = pipeline.compile(); // This y is declared above when handling dither (which needs to know y). for (y = 0; y < srcInfo.height(); ++y) { - run(0,srcInfo.width()); + run(0,y, srcInfo.width()); // The pipeline has pointers to srcRow and dstRow, so we just need to update them in the // loop to move between rows of src/dst. dstRow = SkTAddOffset<void>(dstRow, dstRB); diff --git a/src/core/SkPM4fPriv.h b/src/core/SkPM4fPriv.h index 26f15579ea..700e1280da 100644 --- a/src/core/SkPM4fPriv.h +++ b/src/core/SkPM4fPriv.h @@ -157,7 +157,7 @@ static inline SkColor4f to_colorspace(const SkColor4f& c, SkColorSpace* src, SkC append_gamut_transform(&p, scratch_matrix_3x4, src, dst, kUnpremul_SkAlphaType); p.append(SkRasterPipeline::store_f32, &color4f_ptr); - p.run(0,1); + p.run(0,0,1); } return color4f; } diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h index 0769f701ef..39a2f1f8e6 100644 --- a/src/core/SkRasterPipeline.h +++ b/src/core/SkRasterPipeline.h @@ -135,10 +135,10 @@ public: void extend(const SkRasterPipeline&); // Runs the pipeline walking x through [x,x+n). - void run(size_t x, size_t n) const; + void run(size_t x, size_t y, size_t n) const; // Allocates a thunk which amortizes run() setup cost in alloc. - std::function<void(size_t, size_t)> compile() const; + std::function<void(size_t, size_t, size_t)> compile() const; void dump() const; diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp index a34609ff80..2f28eec78c 100644 --- a/src/core/SkRasterPipelineBlitter.cpp +++ b/src/core/SkRasterPipelineBlitter.cpp @@ -67,10 +67,10 @@ private: uint64_t fMemsetColor = 0; // Big enough for largest dst format, F16. // Built lazily on first use. - std::function<void(size_t, size_t)> fBlitH, - fBlitAntiH, - fBlitMaskA8, - fBlitMaskLCD16; + std::function<void(size_t, size_t, size_t)> fBlitH, + fBlitAntiH, + fBlitMaskA8, + fBlitMaskLCD16; // These values are pointed to by the blit pipelines above, // which allows us to adjust them from call to call. @@ -211,7 +211,7 @@ SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst, if (is_constant) { auto constantColor = alloc->make<SkPM4f>(); colorPipeline->append(SkRasterPipeline::store_f32, &constantColor); - colorPipeline->run(0,1); + colorPipeline->run(0,0,1); colorPipeline->reset(); colorPipeline->append(SkRasterPipeline::constant_color, constantColor); @@ -232,7 +232,7 @@ SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst, p.extend(*colorPipeline); blitter->fDstPtr = &blitter->fMemsetColor; blitter->append_store(&p); - p.run(0,1); + p.run(0,0,1); blitter->fCanMemsetInBlitH = true; } @@ -336,7 +336,7 @@ void SkRasterPipelineBlitter::blitH(int x, int y, int w) { fBlitH = p.compile(); } this->maybe_shade(x,y,w); - fBlitH(x,w); + fBlitH(x,y,w); } void SkRasterPipelineBlitter::blitAntiH(int x, int y, const SkAlpha aa[], const int16_t runs[]) { @@ -366,7 +366,7 @@ void SkRasterPipelineBlitter::blitAntiH(int x, int y, const SkAlpha aa[], const default: this->maybe_shade(x,y,run); fCurrentCoverage = *aa * (1/255.0f); - fBlitAntiH(x,run); + fBlitAntiH(x,y,run); } x += run; runs += run; @@ -417,11 +417,11 @@ void SkRasterPipelineBlitter::blitMask(const SkMask& mask, const SkIRect& clip) switch (mask.fFormat) { case SkMask::kA8_Format: fMaskPtr = mask.getAddr8(x,y)-x; - fBlitMaskA8(x,clip.width()); + fBlitMaskA8(x,y,clip.width()); break; case SkMask::kLCD16_Format: fMaskPtr = mask.getAddrLCD16(x,y)-x; - fBlitMaskLCD16(x,clip.width()); + fBlitMaskLCD16(x,y,clip.width()); break; default: // TODO |