diff --git a/libs/image/kis_antialiasing_fade_maker.h b/libs/image/kis_antialiasing_fade_maker.h --- a/libs/image/kis_antialiasing_fade_maker.h +++ b/libs/image/kis_antialiasing_fade_maker.h @@ -194,6 +194,16 @@ return false; } + qreal getXLimit() { return m_xLimit; } + qreal getYLimit() { return m_yLimit; } + + qreal getXFadeLimitStart() { return m_xFadeLimitStart; } + qreal getYFadeLimitStart() { return m_yFadeLimitStart; } + qreal getXFadeCoeff(){ return m_xFadeCoeff; } + qreal getYFadeCoeff(){ return m_yFadeCoeff; } + + bool getAliasingEnabled() { return m_enableAntialiasing; } + private: qreal m_xLimit; qreal m_yLimit; diff --git a/libs/image/kis_brush_mask_applicator_factories.cpp b/libs/image/kis_brush_mask_applicator_factories.cpp --- a/libs/image/kis_brush_mask_applicator_factories.cpp +++ b/libs/image/kis_brush_mask_applicator_factories.cpp @@ -22,6 +22,7 @@ #include "kis_circle_mask_generator_p.h" #include "kis_gauss_circle_mask_generator_p.h" #include "kis_curve_circle_mask_generator_p.h" +#include "kis_gauss_rect_mask_generator_p.h" #include "kis_brush_mask_applicators.h" #include "kis_brush_mask_applicator_base.h" @@ -53,7 +54,6 @@ return new KisBrushMaskVectorApplicator(maskGenerator); } - template<> template<> MaskApplicatorFactory::ReturnType @@ -62,6 +62,14 @@ return new KisBrushMaskVectorApplicator(maskGenerator); } +template<> +template<> +MaskApplicatorFactory::ReturnType +MaskApplicatorFactory::create(ParamType maskGenerator) +{ + return new KisBrushMaskVectorApplicator(maskGenerator); +} + #if defined HAVE_VC @@ -375,4 +383,133 @@ } } +struct KisGaussRectangleMaskGenerator::FastRowProcessor +{ + FastRowProcessor(KisGaussRectangleMaskGenerator *maskGenerator) + : d(maskGenerator->d.data()) {} + + template + void process(float* buffer, int width, float y, float cosa, float sina, + float centerX, float centerY); + + KisGaussRectangleMaskGenerator::Private *d; +}; + +template<> void KisGaussRectangleMaskGenerator:: +FastRowProcessor::process(float* buffer, int width, float y, float cosa, float sina, + float centerX, float centerY) +{ + const bool antialiasOn = d->fadeMaker.getAliasingEnabled(); + + float y_ = y - centerY; + float sinay_ = sina * y_; + float cosay_ = cosa * y_; + + float* bufferPointer = buffer; + + Vc::float_v currentIndices = Vc::float_v::IndexesFromZero(); + + Vc::float_v increment((float)Vc::float_v::size()); + Vc::float_v vCenterX(centerX); + + Vc::float_v vCosa(cosa); + Vc::float_v vSina(sina); + Vc::float_v vCosaY_(cosay_); + Vc::float_v vSinaY_(sinay_); + + Vc::float_v vhalfWidth(d->halfWidth); + Vc::float_v vhalfHeight(d->halfHeight); + Vc::float_v vXFade(d->xfade); + Vc::float_v vYFade(d->yfade); + + Vc::float_v vAlphafactor(d->alphafactor); + + Vc::float_v vXLimit(d->fadeMaker.getXLimit()); + Vc::float_v vYLimit(d->fadeMaker.getYLimit()); + Vc::float_v vXFadeLimitStart(d->fadeMaker.getXFadeLimitStart()); + Vc::float_v vYFadeLimitStart(d->fadeMaker.getYFadeLimitStart()); + Vc::float_v vXFadeCoeff(d->fadeMaker.getXFadeCoeff()); + Vc::float_v vYFadeCoeff(d->fadeMaker.getYFadeCoeff()); + + Vc::float_v vOne(Vc::One); + Vc::float_v vZero(Vc::Zero); + Vc::float_v vValMax(255.f); + + for (int i=0; i < width; i+= Vc::float_v::size()){ + + Vc::float_v x_ = currentIndices - vCenterX; + + Vc::float_v xr = x_ * vCosa - vSinaY_; + Vc::float_v yr = abs(x_ * vSina + vCosaY_); + + Vc::float_v vValue; + + // BEGIN FadeMaker needFade vectorized 2D + Vc::float_v xra = abs(xr); + Vc::float_m outXMask = xr > vXLimit; + Vc::float_m outYMask = yr > vYLimit; + + Vc::float_m excludeMask(outXMask | outYMask); + vValue(excludeMask) = vOne; + + if (!excludeMask.isFull()) { + Vc::float_v fullFade = vValMax - (vAlphafactor * (d->vErf((vhalfWidth + xr) * vXFade) + d->vErf((vhalfWidth - xr) * vXFade)) + * (d->vErf((vhalfHeight + yr) * vYFade) + d->vErf((vhalfHeight - yr) * vYFade))); + // if antialias is off, do not process + Vc::float_m fadeXStartMask(false); + Vc::float_m fadeYStartMask(false); + + if(antialiasOn){ + Vc::float_v fadeValue; + Vc::SimdArray vBaseValue(fullFade); + + fadeXStartMask = xra > vXFadeLimitStart; + fadeXStartMask = (fadeXStartMask ^ excludeMask) & fadeXStartMask; + if (!fadeXStartMask.isFull()) { + fadeValue = vBaseValue + (vValMax - vBaseValue) * (xra - vXFadeLimitStart) * vXFadeCoeff; + fadeValue(fadeXStartMask & ((yr > vYFadeLimitStart) & (fadeValue < vValMax)) ) = + fadeValue + (vValMax - fadeValue) * (yr - vYFadeLimitStart) * vYFadeCoeff; + fullFade(fadeXStartMask) = fadeValue; + } + + fadeYStartMask = yr > vYFadeLimitStart; + fadeYStartMask = (fadeYStartMask ^ fadeXStartMask) & fadeYStartMask; + if (!fadeYStartMask.isFull()) { + fadeValue = vBaseValue + (vValMax - vBaseValue) * (yr - vYFadeLimitStart) * vYFadeCoeff; + fadeValue(fadeYStartMask & ((xra > vXFadeLimitStart) & (fadeValue < vValMax)) ) = + fadeValue + (vValMax - fadeValue) * (xra - vXFadeLimitStart) * vXFadeCoeff; + fullFade(fadeYStartMask) = fadeValue; + } + } + + Vc::float_m mask; + // Mask undefined values, out of range are out of mask + mask = Vc::isfinite(fullFade); + fullFade.setZero(!mask); + + // Mask in the inner circe of the mask + mask = fullFade < vZero; + fullFade.setZero(mask); + + // Mask the outter circle + mask = fullFade > 254.974f; + fullFade(mask) = vValMax; + + // Mask (value - value), presicion errors. + Vc::float_v vFade = fullFade / vValMax; + + + // return original vValue values before vFade transform + vFade(excludeMask) = vValue; + vFade.store(bufferPointer, Vc::Aligned); + + } else { + vValue.store(bufferPointer, Vc::Aligned); + } + currentIndices = currentIndices + increment; + + bufferPointer += Vc::float_v::size(); + } +} + #endif /* defined HAVE_VC */ diff --git a/libs/image/kis_gauss_rect_mask_generator.h b/libs/image/kis_gauss_rect_mask_generator.h --- a/libs/image/kis_gauss_rect_mask_generator.h +++ b/libs/image/kis_gauss_rect_mask_generator.h @@ -22,14 +22,15 @@ #include "kritaimage_export.h" - +#include "kis_mask_generator.h" /** * This mask generator uses a Gaussian-blurred rectangle */ class KRITAIMAGE_EXPORT KisGaussRectangleMaskGenerator : public KisMaskGenerator { - +public: + struct FastRowProcessor; public: KisGaussRectangleMaskGenerator(qreal diameter, qreal ratio, qreal fh, qreal fv, int spikes, bool antialiasEdges); @@ -40,6 +41,11 @@ quint8 valueAt(qreal x, qreal y) const override; void setScale(qreal scaleX, qreal scaleY) override; + bool shouldSupersample() const override; + bool shouldVectorize() const override; + KisBrushMaskApplicatorBase* applicator() override; + void resetMaskApplicator(bool forceScalar); + private: struct Private; const QScopedPointer d; diff --git a/libs/image/kis_gauss_rect_mask_generator.cpp b/libs/image/kis_gauss_rect_mask_generator.cpp --- a/libs/image/kis_gauss_rect_mask_generator.cpp +++ b/libs/image/kis_gauss_rect_mask_generator.cpp @@ -21,6 +21,25 @@ #include #include +#include +#ifdef HAVE_VC +#if defined(__clang__) +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wlocal-type-template-args" +#endif +#if defined _MSC_VER +// Lets shut up the "possible loss of data" and "forcing value to bool 'true' or 'false' +#pragma warning ( push ) +#pragma warning ( disable : 4244 ) +#pragma warning ( disable : 4800 ) +#endif +#include +#include +#if defined _MSC_VER +#pragma warning ( pop ) +#endif +#endif + #include #include #include @@ -30,8 +49,11 @@ #include "kis_fast_math.h" #include "kis_base_mask_generator.h" -#include "kis_gauss_rect_mask_generator.h" #include "kis_antialiasing_fade_maker.h" +#include "kis_brush_mask_applicator_factories.h" +#include "kis_brush_mask_applicator_base.h" +#include "kis_gauss_rect_mask_generator.h" +#include "kis_gauss_rect_mask_generator_p.h" #define M_SQRT_2 1.41421356237309504880 @@ -41,42 +63,21 @@ #define erf(x) boost::math::erf(x) #endif -struct Q_DECL_HIDDEN KisGaussRectangleMaskGenerator::Private -{ - Private(bool enableAntialiasing) - : fadeMaker(*this, enableAntialiasing) - { - } - - Private(const Private &rhs) - : xfade(rhs.xfade), - yfade(rhs.yfade), - halfWidth(rhs.halfWidth), - halfHeight(rhs.halfHeight), - alphafactor(rhs.alphafactor), - fadeMaker(rhs.fadeMaker, *this) - { - } - - qreal xfade, yfade; - qreal halfWidth, halfHeight; - qreal alphafactor; - - KisAntialiasingFadeMaker2D fadeMaker; - inline quint8 value(qreal x, qreal y) const; -}; KisGaussRectangleMaskGenerator::KisGaussRectangleMaskGenerator(qreal diameter, qreal ratio, qreal fh, qreal fv, int spikes, bool antialiasEdges) : KisMaskGenerator(diameter, ratio, fh, fv, spikes, antialiasEdges, RECTANGLE, GaussId), d(new Private(antialiasEdges)) { setScale(1.0, 1.0); + + d->applicator.reset(createOptimizedClass >(this)); } KisGaussRectangleMaskGenerator::KisGaussRectangleMaskGenerator(const KisGaussRectangleMaskGenerator &rhs) : KisMaskGenerator(rhs), d(new Private(*rhs.d)) { + d->applicator.reset(createOptimizedClass >(this)); } KisMaskGenerator* KisGaussRectangleMaskGenerator::clone() const @@ -126,3 +127,23 @@ return d->value(xr, yr); } + +bool KisGaussRectangleMaskGenerator::shouldSupersample() const +{ + return effectiveSrcWidth() < 10 || effectiveSrcHeight() < 10; +} + +bool KisGaussRectangleMaskGenerator::shouldVectorize() const +{ + return !shouldSupersample() && spikes() == 2; +} + +KisBrushMaskApplicatorBase* KisGaussRectangleMaskGenerator::applicator() +{ + return d->applicator.data(); +} + +void KisGaussRectangleMaskGenerator::resetMaskApplicator(bool forceScalar) +{ + d->applicator.reset(createOptimizedClass >(this,forceScalar)); +} diff --git a/libs/image/tests/KisMaskGeneratorBenchmark.h b/libs/image/tests/KisMaskGeneratorBenchmark.h --- a/libs/image/tests/KisMaskGeneratorBenchmark.h +++ b/libs/image/tests/KisMaskGeneratorBenchmark.h @@ -34,6 +34,9 @@ void testCircularSoftScalarMask(); void testCircularSoftVectorMask(); + + void testRectangularGaussScalarMask(); + void testRectangularGaussVectorMask(); }; #endif // KISMASKGENERATORBENCHMARK_H diff --git a/libs/image/tests/KisMaskGeneratorBenchmark.cpp b/libs/image/tests/KisMaskGeneratorBenchmark.cpp --- a/libs/image/tests/KisMaskGeneratorBenchmark.cpp +++ b/libs/image/tests/KisMaskGeneratorBenchmark.cpp @@ -135,4 +135,25 @@ } } +void KisMaskGeneratorBenchmark::testRectangularGaussScalarMask() +{ + QRect bounds(0,0,1000,1000); + { + KisGaussRectangleMaskGenerator circScalar(1000, 1.0, 0.5, 0.5, 2, true); +// circScalar.setDiameter(1000); + circScalar.resetMaskApplicator(true); // Force usage of scalar backend + + KisMaskGeneratorBenchmarkTester(circScalar.applicator(), bounds); + } +} +void KisMaskGeneratorBenchmark::testRectangularGaussVectorMask() +{ + QRect bounds(0,0,1000,1000); + { + KisGaussRectangleMaskGenerator circVectr(1000, 1.0, 0.5, 0.5, 2, true); +// circVectr.setDiameter(1000); + KisMaskGeneratorBenchmarkTester(circVectr.applicator(), bounds); + } +} + QTEST_MAIN(KisMaskGeneratorBenchmark) diff --git a/libs/image/tests/kis_mask_similarity_test.h b/libs/image/tests/kis_mask_similarity_test.h --- a/libs/image/tests/kis_mask_similarity_test.h +++ b/libs/image/tests/kis_mask_similarity_test.h @@ -29,6 +29,7 @@ void testCircleMask(); void testGaussCircleMask(); void testSoftCircleMask(); + void testGaussRectMask(); }; #endif diff --git a/libs/image/tests/kis_mask_similarity_test.cpp b/libs/image/tests/kis_mask_similarity_test.cpp --- a/libs/image/tests/kis_mask_similarity_test.cpp +++ b/libs/image/tests/kis_mask_similarity_test.cpp @@ -65,14 +65,15 @@ QImage vectorImage(m_paintDev->convertToQImage(m_colorSpace->profile())); vectorImage.invertPixels(); // Make pixel color black - if (renderImage) { - scalarImage.save(QString(getTypeName(type) + "_scalar_mask.png"),"PNG"); - vectorImage.save(QString(getTypeName(type) +"_vector_mask.png"),"PNG"); - } // Check for differences, max errors: 0 QPoint tmpPt; QVERIFY(TestUtil::compareQImages(tmpPt,scalarImage, vectorImage, 0, 2, 0)); + + if (renderImage || QTest::currentTestFailed()) { + scalarImage.save(QString(getTypeName(type) + "_scalar_mask.png"),"PNG"); + vectorImage.save(QString(getTypeName(type) + "_vector_mask.png"),"PNG"); + } } private: @@ -179,4 +180,32 @@ } } } // end for } +void KisMaskSimilarityTest::testGaussRectMask() +{ + QRect bounds(0,0,540,540); + { + KisGaussRectangleMaskGenerator circVectr(500, 1.0, .5, .5, 2, true); + KisGaussRectangleMaskGenerator circScalar(circVectr); + + circScalar.resetMaskApplicator(true); // Force usage of scalar backend + KisMaskSimilarityTester(circScalar.applicator(), circVectr.applicator(), bounds, RECT_GAUSS); + } + // Exahustive test + for (size_t i = 0; i <= 100; i += 3){ + for (size_t j = 0; j <= 100; j += 3){ + for (size_t k = 0; k <= 100; k += 15){ + { + KisGaussRectangleMaskGenerator circVectr(500, k/100.f, i/100.f, j/100.f, 2, true); + KisGaussRectangleMaskGenerator circScalar(circVectr); + + circScalar.resetMaskApplicator(true); // Force usage of scalar backend + KisMaskSimilarityTester(circScalar.applicator(), circVectr.applicator(), bounds,RECT_GAUSS,false); + if (QTest::currentTestFailed()) { + qDebug() << "failed at Ratio: " << k << ", fh: "<< i <<", fv: "<< j; + std::exit(1); + } + } + } } } // end for +} + QTEST_MAIN(KisMaskSimilarityTest)