diff options
Diffstat (limited to 'src')
53 files changed, 397 insertions, 287 deletions
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index c3b10184f4..e382d09c99 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -15,7 +15,6 @@ #if SK_SUPPORT_GPU #include "effects/GrBicubicEffect.h" -#include "effects/GrExtractAlphaFragmentProcessor.h" #include "effects/GrSimpleTextureEffect.h" #endif @@ -354,21 +353,22 @@ void SkBitmapProcShader::toString(SkString* str) const { #include "SkGr.h" #include "effects/GrSimpleTextureEffect.h" -const GrFragmentProcessor* SkBitmapProcShader::asFragmentProcessor(GrContext* context, - const SkMatrix& viewM, const SkMatrix* localMatrix, - SkFilterQuality filterQuality, - GrProcessorDataManager* procDataManager) const { +bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewM, + const SkMatrix* localMatrix, GrColor* paintColor, + GrProcessorDataManager* procDataManager, + GrFragmentProcessor** fp) const { SkMatrix matrix; matrix.setIDiv(fRawBitmap.width(), fRawBitmap.height()); SkMatrix lmInverse; if (!this->getLocalMatrix().invert(&lmInverse)) { - return nullptr; + return false; } if (localMatrix) { SkMatrix inv; if (!localMatrix->invert(&inv)) { - return nullptr; + return false; } lmInverse.postConcat(inv); } @@ -385,7 +385,7 @@ const GrFragmentProcessor* SkBitmapProcShader::asFragmentProcessor(GrContext* co // are provided by the caller. bool doBicubic; GrTextureParams::FilterMode textureFilterMode = - GrSkFilterQualityToGrFilterMode(filterQuality, viewM, this->getLocalMatrix(), + GrSkFilterQualityToGrFilterMode(paint.getFilterQuality(), viewM, this->getLocalMatrix(), &doBicubic); GrTextureParams params(tm, textureFilterMode); SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(context, fRawBitmap, ¶ms)); @@ -393,20 +393,29 @@ const GrFragmentProcessor* SkBitmapProcShader::asFragmentProcessor(GrContext* co if (!texture) { SkErrorInternals::SetError( kInternalError_SkError, "Couldn't convert bitmap to texture."); - return nullptr; + return false; } - SkAutoTUnref<GrFragmentProcessor> inner; + *paintColor = (kAlpha_8_SkColorType == fRawBitmap.colorType()) ? + SkColor2GrColor(paint.getColor()) : + SkColor2GrColorJustAlpha(paint.getColor()); + if (doBicubic) { - inner.reset(GrBicubicEffect::Create(procDataManager, texture, matrix, tm)); + *fp = GrBicubicEffect::Create(procDataManager, texture, matrix, tm); } else { - inner.reset(GrSimpleTextureEffect::Create(procDataManager, texture, matrix, params)); + *fp = GrSimpleTextureEffect::Create(procDataManager, texture, matrix, params); } - if (kAlpha_8_SkColorType == fRawBitmap.colorType()) { - return SkRef(inner.get()); - } - return GrExtractAlphaFragmentProcessor::Create(inner); + return true; +} + +#else + +bool SkBitmapProcShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; } #endif diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h index 4215b90efb..30f860a9bf 100644 --- a/src/core/SkBitmapProcShader.h +++ b/src/core/SkBitmapProcShader.h @@ -29,11 +29,10 @@ public: SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapProcShader) -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM, - const SkMatrix*, SkFilterQuality, - GrProcessorDataManager*) const override; -#endif + + bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, + GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override; class BitmapProcShaderContext : public SkShader::Context { public: diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h index b5902b41e1..6702ef6085 100644 --- a/src/core/SkColorShader.h +++ b/src/core/SkColorShader.h @@ -49,11 +49,9 @@ public: GradientType asAGradient(GradientInfo* info) const override; -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM, - const SkMatrix*, SkFilterQuality, - GrProcessorDataManager*) const override; -#endif + bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader) diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp index 212cdb65f9..a8d346ab1e 100644 --- a/src/core/SkLightingShader.cpp +++ b/src/core/SkLightingShader.cpp @@ -72,10 +72,9 @@ public: bool isOpaque() const override; -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM, - const SkMatrix* localMatrix, SkFilterQuality, GrProcessorDataManager*) const override; -#endif + bool asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix& viewM, + const SkMatrix* localMatrix, GrColor* color, + GrProcessorDataManager*, GrFragmentProcessor** fp) const override; size_t contextSize() const override; @@ -128,7 +127,6 @@ private: #include "GrCoordTransform.h" #include "GrFragmentProcessor.h" #include "GrTextureAccess.h" -#include "effects/GrExtractAlphaFragmentProcessor.h" #include "gl/GrGLProcessor.h" #include "gl/builders/GrGLProgramBuilder.h" #include "SkGr.h" @@ -343,9 +341,10 @@ static bool make_mat(const SkBitmap& bm, return true; } -const GrFragmentProcessor* SkLightingShaderImpl::asFragmentProcessor(GrContext* context, - const SkMatrix& viewM, const SkMatrix* localMatrix, SkFilterQuality filterQuality, - GrProcessorDataManager* pdm) const { +bool SkLightingShaderImpl::asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewM, const SkMatrix* localMatrix, + GrColor* color, GrProcessorDataManager* pdm, + GrFragmentProcessor** fp) const { // we assume diffuse and normal maps have same width and height // TODO: support different sizes SkASSERT(fDiffuseMap.width() == fNormalMap.width() && @@ -353,23 +352,23 @@ const GrFragmentProcessor* SkLightingShaderImpl::asFragmentProcessor(GrContext* SkMatrix diffM, normM; if (!make_mat(fDiffuseMap, this->getLocalMatrix(), localMatrix, &diffM)) { - return nullptr; + return false; } if (!make_mat(fNormalMap, fNormLocalMatrix, localMatrix, &normM)) { - return nullptr; + return false; } bool doBicubic; GrTextureParams::FilterMode diffFilterMode = GrSkFilterQualityToGrFilterMode( - SkTMin(filterQuality, kMedium_SkFilterQuality), + SkTMin(paint.getFilterQuality(), kMedium_SkFilterQuality), viewM, this->getLocalMatrix(), &doBicubic); SkASSERT(!doBicubic); GrTextureParams::FilterMode normFilterMode = GrSkFilterQualityToGrFilterMode( - SkTMin(filterQuality, kMedium_SkFilterQuality), + SkTMin(paint.getFilterQuality(), kMedium_SkFilterQuality), viewM, fNormLocalMatrix, &doBicubic); @@ -380,22 +379,34 @@ const GrFragmentProcessor* SkLightingShaderImpl::asFragmentProcessor(GrContext* SkAutoTUnref<GrTexture> diffuseTexture(GrRefCachedBitmapTexture(context, fDiffuseMap, &diffParams)); if (!diffuseTexture) { - SkErrorInternals::SetError(kInternalError_SkError, "Couldn't convert bitmap to texture."); - return nullptr; + SkErrorInternals::SetError(kInternalError_SkError, + "Couldn't convert bitmap to texture."); + return false; } GrTextureParams normParams(kClamp_TileMode, normFilterMode); SkAutoTUnref<GrTexture> normalTexture(GrRefCachedBitmapTexture(context, fNormalMap, &normParams)); if (!normalTexture) { - SkErrorInternals::SetError(kInternalError_SkError, "Couldn't convert bitmap to texture."); - return nullptr; + SkErrorInternals::SetError(kInternalError_SkError, + "Couldn't convert bitmap to texture."); + return false; } - SkAutoTUnref<const GrFragmentProcessor> inner ( - new LightingFP(pdm, diffuseTexture, normalTexture, diffM, normM, diffParams, normParams, - fLights, fInvNormRotation)); - return GrExtractAlphaFragmentProcessor::Create(inner); + *fp = new LightingFP(pdm, diffuseTexture, normalTexture, diffM, normM, diffParams, normParams, + fLights, fInvNormRotation); + + *color = GrColorPackA4(paint.getAlpha()); + return true; +} +#else + +bool SkLightingShaderImpl::asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewM, const SkMatrix* localMatrix, + GrColor* color, GrProcessorDataManager*, + GrFragmentProcessor** fp) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; } #endif diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h index 9c6a526f7b..a145432a16 100644 --- a/src/core/SkLocalMatrixShader.h +++ b/src/core/SkLocalMatrixShader.h @@ -33,15 +33,28 @@ public: } #if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext* context, const SkMatrix& viewM, - const SkMatrix* localMatrix, SkFilterQuality fq, - GrProcessorDataManager* procDataManager) const override { + + virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewM, const SkMatrix* localMatrix, + GrColor* grColor, GrProcessorDataManager* procDataManager, + GrFragmentProcessor** fp) const override { SkMatrix tmp = this->getLocalMatrix(); if (localMatrix) { tmp.preConcat(*localMatrix); } - return fProxyShader->asFragmentProcessor(context, viewM, &tmp, fq, procDataManager); + return fProxyShader->asFragmentProcessor(context, paint, viewM, &tmp, grColor, + procDataManager, fp); } + +#else + + virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; + } + #endif SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const override { diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp index f3ac638025..0b3c9e864b 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/core/SkPictureShader.cpp @@ -336,17 +336,27 @@ void SkPictureShader::toString(SkString* str) const { #endif #if SK_SUPPORT_GPU -const GrFragmentProcessor* SkPictureShader::asFragmentProcessor(GrContext* context, - const SkMatrix& viewM, const SkMatrix* localMatrix, SkFilterQuality fq, - GrProcessorDataManager* procDataManager) const { +bool SkPictureShader::asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewM, const SkMatrix* localMatrix, + GrColor* paintColor, + GrProcessorDataManager* procDataManager, + GrFragmentProcessor** fp) const { int maxTextureSize = 0; if (context) { maxTextureSize = context->caps()->maxTextureSize(); } SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(viewM, localMatrix, maxTextureSize)); if (!bitmapShader) { - return nullptr; + return false; } - return bitmapShader->asFragmentProcessor(context, viewM, nullptr, fq, procDataManager); + return bitmapShader->asFragmentProcessor(context, paint, viewM, nullptr, paintColor, + procDataManager, fp); +} +#else +bool SkPictureShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; } #endif diff --git a/src/core/SkPictureShader.h b/src/core/SkPictureShader.h index 6249e41e37..31a60fd9e2 100644 --- a/src/core/SkPictureShader.h +++ b/src/core/SkPictureShader.h @@ -30,10 +30,9 @@ public: SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader) -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM, - const SkMatrix*, SkFilterQuality, GrProcessorDataManager*) const override; -#endif + bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, + GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override; protected: SkPictureShader(SkReadBuffer&); diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index b3edf47dfd..51a8017b5e 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -214,10 +214,10 @@ SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const { return kNone_GradientType; } -const GrFragmentProcessor* SkShader::asFragmentProcessor(GrContext*, const SkMatrix&, - const SkMatrix*, SkFilterQuality, - GrProcessorDataManager*) const { - return nullptr; +bool SkShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*, + GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + return false; } SkShader* SkShader::refAsALocalMatrixShader(SkMatrix*) const { @@ -335,12 +335,24 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const { #if SK_SUPPORT_GPU #include "SkGr.h" -#include "effects/GrConstColorProcessor.h" -const GrFragmentProcessor* SkColorShader::asFragmentProcessor(GrContext*, const SkMatrix&, - const SkMatrix*, SkFilterQuality, - GrProcessorDataManager*) const { - GrColor color = SkColor2GrColor(fColor); - return GrConstColorProcessor::Create(color, GrConstColorProcessor::kModulateA_InputMode); + +bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix&, + const SkMatrix*, GrColor* paintColor, + GrProcessorDataManager*, GrFragmentProcessor** fp) const { + *fp = nullptr; + SkColor skColor = fColor; + U8CPU newA = SkMulDiv255Round(SkColorGetA(fColor), paint.getAlpha()); + *paintColor = SkColor2GrColor(SkColorSetA(skColor, newA)); + return true; +} + +#else + +bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; } #endif diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index b28a62bcd7..0f96cdf59a 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -195,7 +195,7 @@ void GrGLAlphaThresholdEffect::onSetData(const GrGLProgramDataManager& pdman, GR_DEFINE_FRAGMENT_PROCESSOR_TEST(AlphaThresholdEffect); -const GrFragmentProcessor* AlphaThresholdEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* AlphaThresholdEffect::TestCreate(GrProcessorTestData* d) { GrTexture* bmpTex = d->fTextures[GrProcessorUnitTest::kSkiaPMTextureIdx]; GrTexture* maskTex = d->fTextures[GrProcessorUnitTest::kAlphaTextureIdx]; float innerThresh = d->fRandom->nextUScalar1(); diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index fd20b73cdc..7732917e42 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -137,7 +137,7 @@ void GrArithmeticFP::onComputeInvariantOutput(GrInvariantOutput* inout) const { /////////////////////////////////////////////////////////////////////////////// -const GrFragmentProcessor* GrArithmeticFP::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrArithmeticFP::TestCreate(GrProcessorTestData* d) { float k1 = d->fRandom->nextF(); float k2 = d->fRandom->nextF(); float k3 = d->fRandom->nextF(); @@ -295,7 +295,7 @@ void GrArithmeticXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorP GR_DEFINE_XP_FACTORY_TEST(GrArithmeticXPFactory); -const GrXPFactory* GrArithmeticXPFactory::TestCreate(GrProcessorTestData* d) { +GrXPFactory* GrArithmeticXPFactory::TestCreate(GrProcessorTestData* d) { float k1 = d->fRandom->nextF(); float k2 = d->fRandom->nextF(); float k3 = d->fRandom->nextF(); diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 1bd708b5e0..f2bcf3ed0d 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -816,7 +816,7 @@ void GrRectBlurEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRectBlurEffect); -const GrFragmentProcessor* GrRectBlurEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrRectBlurEffect::TestCreate(GrProcessorTestData* d) { float sigma = d->fRandom->nextRangeF(3,8); float width = d->fRandom->nextRangeF(200,300); float height = d->fRandom->nextRangeF(200,300); @@ -997,7 +997,7 @@ bool GrRRectBlurEffect::onIsEqual(const GrFragmentProcessor& other) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRRectBlurEffect); -const GrFragmentProcessor* GrRRectBlurEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrRRectBlurEffect::TestCreate(GrProcessorTestData* d) { SkScalar w = d->fRandom->nextRangeScalar(100.f, 1000.f); SkScalar h = d->fRandom->nextRangeScalar(100.f, 1000.f); SkScalar r = d->fRandom->nextRangeF(1.f, 9.f); diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index c38328ccbb..c3fa730d00 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -339,7 +339,7 @@ void ModeColorFilterEffect::onComputeInvariantOutput(GrInvariantOutput* inout) c } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ModeColorFilterEffect); -const GrFragmentProcessor* ModeColorFilterEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* ModeColorFilterEffect::TestCreate(GrProcessorTestData* d) { SkXfermode::Mode mode = SkXfermode::kDst_Mode; while (SkXfermode::kDst_Mode == mode) { mode = static_cast<SkXfermode::Mode>(d->fRandom->nextRangeU(0, SkXfermode::kLastCoeffMode)); diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 92b26ebdf9..8dc603042c 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -526,7 +526,7 @@ private: GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ColorMatrixEffect); -const GrFragmentProcessor* ColorMatrixEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* ColorMatrixEffect::TestCreate(GrProcessorTestData* d) { SkColorMatrix colorMatrix; for (size_t i = 0; i < SK_ARRAY_COUNT(colorMatrix.fMat); ++i) { colorMatrix.fMat[i] = d->fRandom->nextSScalar1(); diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 49290718e3..9044284300 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -517,7 +517,7 @@ void GrDisplacementMapEffect::onComputeInvariantOutput(GrInvariantOutput* inout) GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDisplacementMapEffect); -const GrFragmentProcessor* GrDisplacementMapEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrDisplacementMapEffect::TestCreate(GrProcessorTestData* d) { int texIdxDispl = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; int texIdxColor = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 240a6939ae..dd56751382 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -1633,7 +1633,7 @@ GrGLFragmentProcessor* GrDiffuseLightingEffect::onCreateGLInstance() const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDiffuseLightingEffect); -const GrFragmentProcessor* GrDiffuseLightingEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrDiffuseLightingEffect::TestCreate(GrProcessorTestData* d) { SkScalar surfaceScale = d->fRandom->nextSScalar1(); SkScalar kd = d->fRandom->nextUScalar1(); SkAutoTUnref<SkImageFilterLight> light(create_random_light(d->fRandom)); @@ -1836,7 +1836,7 @@ GrGLFragmentProcessor* GrSpecularLightingEffect::onCreateGLInstance() const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSpecularLightingEffect); -const GrFragmentProcessor* GrSpecularLightingEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrSpecularLightingEffect::TestCreate(GrProcessorTestData* d) { SkScalar surfaceScale = d->fRandom->nextSScalar1(); SkScalar ks = d->fRandom->nextUScalar1(); SkScalar shininess = d->fRandom->nextUScalar1(); diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 622144bfad..b9998f8122 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -195,7 +195,7 @@ GrGLFragmentProcessor* GrMagnifierEffect::onCreateGLInstance() const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrMagnifierEffect); -const GrFragmentProcessor* GrMagnifierEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrMagnifierEffect::TestCreate(GrProcessorTestData* d) { GrTexture* texture = d->fTextures[0]; const int kMaxWidth = 200; const int kMaxHeight = 200; diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 2c99af92da..cde29c0f4c 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -445,7 +445,7 @@ void GrMorphologyEffect::onComputeInvariantOutput(GrInvariantOutput* inout) cons GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrMorphologyEffect); -const GrFragmentProcessor* GrMorphologyEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrMorphologyEffect::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; Direction dir = d->fRandom->nextBool() ? kX_Direction : kY_Direction; diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 40da2db14a..af6622be4d 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -19,8 +19,6 @@ #include "GrCoordTransform.h" #include "GrInvariantOutput.h" #include "SkGr.h" -#include "effects/GrConstColorProcessor.h" -#include "effects/GrExtractAlphaFragmentProcessor.h" #include "gl/GrGLFragmentProcessor.h" #include "gl/builders/GrGLProgramBuilder.h" #endif @@ -502,6 +500,7 @@ private: bool fStitchTiles; int fNumOctaves; GrGLProgramDataManager::UniformHandle fBaseFrequencyUni; + GrGLProgramDataManager::UniformHandle fAlphaUni; private: typedef GrGLFragmentProcessor INHERITED; @@ -516,9 +515,9 @@ public: int numOctaves, bool stitchTiles, SkPerlinNoiseShader::PaintingData* paintingData, GrTexture* permutationsTexture, GrTexture* noiseTexture, - const SkMatrix& matrix) { + const SkMatrix& matrix, uint8_t alpha) { return new GrPerlinNoiseEffect(procDataManager, type, numOctaves, stitchTiles, paintingData, - permutationsTexture, noiseTexture, matrix); + permutationsTexture, noiseTexture, matrix, alpha); } virtual ~GrPerlinNoiseEffect() { delete fPaintingData; } @@ -532,6 +531,7 @@ public: const SkVector& baseFrequency() const { return fPaintingData->fBaseFrequency; } int numOctaves() const { return fNumOctaves; } const SkMatrix& matrix() const { return fCoordTransform.getMatrix(); } + uint8_t alpha() const { return fAlpha; } private: GrGLFragmentProcessor* onCreateGLInstance() const override { @@ -549,6 +549,7 @@ private: fPaintingData->fBaseFrequency == s.fPaintingData->fBaseFrequency && fNumOctaves == s.fNumOctaves && fStitchTiles == s.fStitchTiles && + fAlpha == s.fAlpha && fPaintingData->fStitchDataInit == s.fPaintingData->fStitchDataInit; } @@ -560,10 +561,11 @@ private: int numOctaves, bool stitchTiles, SkPerlinNoiseShader::PaintingData* paintingData, GrTexture* permutationsTexture, GrTexture* noiseTexture, - const SkMatrix& matrix) + const SkMatrix& matrix, uint8_t alpha) : fType(type) , fNumOctaves(numOctaves) , fStitchTiles(stitchTiles) + , fAlpha(alpha) , fPermutationsAccess(permutationsTexture) , fNoiseAccess(noiseTexture) , fPaintingData(paintingData) { @@ -580,6 +582,7 @@ private: GrCoordTransform fCoordTransform; int fNumOctaves; bool fStitchTiles; + uint8_t fAlpha; GrTextureAccess fPermutationsAccess; GrTextureAccess fNoiseAccess; SkPerlinNoiseShader::PaintingData *fPaintingData; @@ -591,7 +594,7 @@ private: ///////////////////////////////////////////////////////////////////// GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrPerlinNoiseEffect); -const GrFragmentProcessor* GrPerlinNoiseEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrPerlinNoiseEffect::TestCreate(GrProcessorTestData* d) { int numOctaves = d->fRandom->nextRangeU(2, 10); bool stitchTiles = d->fRandom->nextBool(); SkScalar seed = SkIntToScalar(d->fRandom->nextU()); @@ -608,12 +611,14 @@ const GrFragmentProcessor* GrPerlinNoiseEffect::TestCreate(GrProcessorTestData* SkPerlinNoiseShader::CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles ? &tileSize : nullptr); + SkPaint paint; + GrColor paintColor; GrFragmentProcessor* effect; GrPaint grPaint; - return shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), NULL, - kNone_SkFilterQuality, - grPaint.getProcessorDataManager()); + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, grPaint.getProcessorDataManager(), + &effect)); delete shader; @@ -634,6 +639,10 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) { kVec2f_GrSLType, kDefault_GrSLPrecision, "baseFrequency"); const char* baseFrequencyUni = args.fBuilder->getUniformCStr(fBaseFrequencyUni); + fAlphaUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, + kFloat_GrSLType, kDefault_GrSLPrecision, + "alpha"); + const char* alphaUni = args.fBuilder->getUniformCStr(fAlphaUni); const char* stitchDataUni = nullptr; if (fStitchTiles) { @@ -866,6 +875,8 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) { args.fOutputColor,args.fOutputColor); } + fsBuilder->codeAppendf("\n\t\t%s.a *= %s;", args.fOutputColor, alphaUni); + // Clamp values fsBuilder->codeAppendf("\n\t\t%s = clamp(%s, 0.0, 1.0);", args.fOutputColor, args.fOutputColor); @@ -909,6 +920,7 @@ void GrGLPerlinNoise::onSetData(const GrGLProgramDataManager& pdman, const GrPro const SkVector& baseFrequency = turbulence.baseFrequency(); pdman.set2f(fBaseFrequencyUni, baseFrequency.fX, baseFrequency.fY); + pdman.set1f(fAlphaUni, SkIntToScalar(turbulence.alpha()) / 255); if (turbulence.stitchTiles()) { const SkPerlinNoiseShader::StitchData& stitchData = turbulence.stitchData(); @@ -918,11 +930,17 @@ void GrGLPerlinNoise::onSetData(const GrGLProgramDataManager& pdman, const GrPro } ///////////////////////////////////////////////////////////////////// -const GrFragmentProcessor* SkPerlinNoiseShader::asFragmentProcessor(GrContext* context, - const SkMatrix& viewM, const SkMatrix* externalLocalMatrix, SkFilterQuality, - GrProcessorDataManager* procDataManager) const { + +bool SkPerlinNoiseShader::asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewM, + const SkMatrix* externalLocalMatrix, + GrColor* paintColor, + GrProcessorDataManager* procDataManager, + GrFragmentProcessor** fp) const { SkASSERT(context); + *paintColor = SkColor2GrColorJustAlpha(paint.getColor()); + SkMatrix localMatrix = this->getLocalMatrix(); if (externalLocalMatrix) { localMatrix.preConcat(*externalLocalMatrix); @@ -933,14 +951,13 @@ const GrFragmentProcessor* SkPerlinNoiseShader::asFragmentProcessor(GrContext* c if (0 == fNumOctaves) { if (kFractalNoise_Type == fType) { - // Extract the incoming alpha and emit rgba = (a/4, a/4, a/4, a/2) - SkAutoTUnref<const GrFragmentProcessor> inner( - GrConstColorProcessor::Create(0x80404040, - GrConstColorProcessor::kModulateRGBA_InputMode)); - return GrExtractAlphaFragmentProcessor::Create(inner); + uint32_t alpha = paint.getAlpha() >> 1; + uint32_t rgb = alpha >> 1; + *paintColor = GrColorPackRGBA(rgb, rgb, rgb, alpha); + } else { + *paintColor = 0; } - // Emit zero. - return GrConstColorProcessor::Create(0x0, GrConstColorProcessor::kIgnore_InputMode); + return true; } // Either we don't stitch tiles, either we have a valid tile size @@ -957,18 +974,27 @@ const GrFragmentProcessor* SkPerlinNoiseShader::asFragmentProcessor(GrContext* c m.setTranslateX(-localMatrix.getTranslateX() + SK_Scalar1); m.setTranslateY(-localMatrix.getTranslateY() + SK_Scalar1); if ((permutationsTexture) && (noiseTexture)) { - SkAutoTUnref<GrFragmentProcessor> inner( - GrPerlinNoiseEffect::Create(procDataManager, - fType, - fNumOctaves, - fStitchTiles, - paintingData, - permutationsTexture, noiseTexture, - m)); - return GrExtractAlphaFragmentProcessor::Create(inner); - } - delete paintingData; - return nullptr; + *fp = GrPerlinNoiseEffect::Create(procDataManager, + fType, + fNumOctaves, + fStitchTiles, + paintingData, + permutationsTexture, noiseTexture, + m, paint.getAlpha()); + } else { + delete paintingData; + *fp = nullptr; + } + return true; +} + +#else + +bool SkPerlinNoiseShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; } #endif diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 1a2b1343b6..f0245b7cfa 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -541,7 +541,7 @@ void ColorTableEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ColorTableEffect); -const GrFragmentProcessor* ColorTableEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* ColorTableEffect::TestCreate(GrProcessorTestData* d) { int flags = 0; uint8_t luts[256][4]; do { diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index df27ebcb17..86142fda73 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -439,7 +439,6 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y, #if SK_SUPPORT_GPU -#include "effects/GrExtractAlphaFragmentProcessor.h" #include "gl/builders/GrGLProgramBuilder.h" #include "SkGr.h" @@ -508,7 +507,7 @@ private: GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrLinearGradient); -const GrFragmentProcessor* GrLinearGradient::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrLinearGradient::TestCreate(GrProcessorTestData* d) { SkPoint points[] = {{d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}, {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}}; @@ -520,9 +519,12 @@ const GrFragmentProcessor* GrLinearGradient::TestCreate(GrProcessorTestData* d) SkAutoTUnref<SkShader> shader(SkGradientShader::CreateLinear(points, colors, stops, colorCount, tm)); - const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager); - GrAlwaysAssert(fp); + SkPaint paint; + GrColor paintColor; + GrFragmentProcessor* fp; + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, d->fProcDataManager, &fp)); return fp; } @@ -539,29 +541,40 @@ void GrGLLinearGradient::emitCode(EmitArgs& args) { ///////////////////////////////////////////////////////////////////// -const GrFragmentProcessor* SkLinearGradient::asFragmentProcessor( - GrContext* context, const SkMatrix& viewm, const SkMatrix* localMatrix, SkFilterQuality, - GrProcessorDataManager* procDataManager) const { +bool SkLinearGradient::asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewm, const SkMatrix* localMatrix, + GrColor* paintColor, + GrProcessorDataManager* procDataManager, + GrFragmentProcessor** fp) const { SkASSERT(context); SkMatrix matrix; if (!this->getLocalMatrix().invert(&matrix)) { - return nullptr; + return false; } if (localMatrix) { SkMatrix inv; if (!localMatrix->invert(&inv)) { - return nullptr; + return false; } matrix.postConcat(inv); } matrix.postConcat(fPtsToUnit); - SkAutoTUnref<const GrFragmentProcessor> inner( - GrLinearGradient::Create(context, procDataManager, *this, matrix, fTileMode)); - return GrExtractAlphaFragmentProcessor::Create(inner); + *paintColor = SkColor2GrColorJustAlpha(paint.getColor()); + *fp = GrLinearGradient::Create(context, procDataManager, *this, matrix, fTileMode); + + return true; } +#else + +bool SkLinearGradient::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; +} #endif diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h index a1ae39fb44..eddb35512f 100644 --- a/src/effects/gradients/SkLinearGradient.h +++ b/src/effects/gradients/SkLinearGradient.h @@ -29,10 +29,9 @@ public: }; GradientType asAGradient(GradientInfo* info) const override; -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM, - const SkMatrix*, SkFilterQuality, GrProcessorDataManager*) const override; -#endif + bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLinearGradient) diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 9cd198cf37..c7e7308251 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -415,7 +415,6 @@ void SkRadialGradient::RadialGradientContext::shadeSpan(int x, int y, #if SK_SUPPORT_GPU #include "SkGr.h" -#include "effects/GrExtractAlphaFragmentProcessor.h" #include "gl/builders/GrGLProgramBuilder.h" class GrGLRadialGradient : public GrGLGradientEffect { @@ -480,7 +479,7 @@ private: GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRadialGradient); -const GrFragmentProcessor* GrRadialGradient::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrRadialGradient::TestCreate(GrProcessorTestData* d) { SkPoint center = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}; SkScalar radius = d->fRandom->nextUScalar1(); @@ -492,9 +491,12 @@ const GrFragmentProcessor* GrRadialGradient::TestCreate(GrProcessorTestData* d) SkAutoTUnref<SkShader> shader(SkGradientShader::CreateRadial(center, radius, colors, stops, colorCount, tm)); - const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager); - GrAlwaysAssert(fp); + SkPaint paint; + GrColor paintColor; + GrFragmentProcessor* fp; + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, d->fProcDataManager, &fp)); return fp; } @@ -512,26 +514,39 @@ void GrGLRadialGradient::emitCode(EmitArgs& args) { ///////////////////////////////////////////////////////////////////// -const GrFragmentProcessor* SkRadialGradient::asFragmentProcessor(GrContext* context, - const SkMatrix& viewM, const SkMatrix* localMatrix, SkFilterQuality, - GrProcessorDataManager* procDataManager) const { +bool SkRadialGradient::asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewM, + const SkMatrix* localMatrix, GrColor* paintColor, + GrProcessorDataManager* procDataManager, + GrFragmentProcessor** fp) const { SkASSERT(context); SkMatrix matrix; if (!this->getLocalMatrix().invert(&matrix)) { - return nullptr; + return false; } if (localMatrix) { SkMatrix inv; if (!localMatrix->invert(&inv)) { - return nullptr; + return false; } matrix.postConcat(inv); } matrix.postConcat(fPtsToUnit); - SkAutoTUnref<const GrFragmentProcessor> inner( - GrRadialGradient::Create(context, procDataManager, *this, matrix, fTileMode)); - return GrExtractAlphaFragmentProcessor::Create(inner); + + *paintColor = SkColor2GrColorJustAlpha(paint.getColor()); + *fp = GrRadialGradient::Create(context, procDataManager, *this, matrix, fTileMode); + + return true; +} + +#else + +bool SkRadialGradient::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; } #endif diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h index bc79d92660..d0f63ac54d 100644 --- a/src/effects/gradients/SkRadialGradient.h +++ b/src/effects/gradients/SkRadialGradient.h @@ -29,10 +29,9 @@ public: }; GradientType asAGradient(GradientInfo* info) const override; -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM, - const SkMatrix*, SkFilterQuality, GrProcessorDataManager*) const override; -#endif + bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRadialGradient) diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index ae88c8a311..c6699e87e0 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -167,7 +167,6 @@ void SkSweepGradient::SweepGradientContext::shadeSpan16(int x, int y, uint16_t* #if SK_SUPPORT_GPU #include "SkGr.h" -#include "effects/GrExtractAlphaFragmentProcessor.h" #include "gl/builders/GrGLProgramBuilder.h" class GrGLSweepGradient : public GrGLGradientEffect { @@ -227,7 +226,7 @@ private: GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSweepGradient); -const GrFragmentProcessor* GrSweepGradient::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrSweepGradient::TestCreate(GrProcessorTestData* d) { SkPoint center = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}; SkColor colors[kMaxRandomGradientColors]; @@ -237,11 +236,12 @@ const GrFragmentProcessor* GrSweepGradient::TestCreate(GrProcessorTestData* d) { int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tmIgnored); SkAutoTUnref<SkShader> shader(SkGradientShader::CreateSweep(center.fX, center.fY, colors, stops, colorCount)); - const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), - NULL, kNone_SkFilterQuality, - d->fProcDataManager); - GrAlwaysAssert(fp); + SkPaint paint; + GrFragmentProcessor* fp; + GrColor paintColor; + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, d->fProcDataManager, &fp)); return fp; } @@ -270,26 +270,38 @@ void GrGLSweepGradient::emitCode(EmitArgs& args) { ///////////////////////////////////////////////////////////////////// -const GrFragmentProcessor* SkSweepGradient::asFragmentProcessor(GrContext* context, - const SkMatrix& viewM, const SkMatrix* localMatrix, SkFilterQuality, - GrProcessorDataManager* procDataManager) const { +bool SkSweepGradient::asFragmentProcessor(GrContext* context, const SkPaint& paint, + const SkMatrix& viewM, + const SkMatrix* localMatrix, GrColor* paintColor, + GrProcessorDataManager* procDataManager, + GrFragmentProcessor** effect) const { SkMatrix matrix; if (!this->getLocalMatrix().invert(&matrix)) { - return nullptr; + return false; } if (localMatrix) { SkMatrix inv; if (!localMatrix->invert(&inv)) { - return nullptr; + return false; } matrix.postConcat(inv); } matrix.postConcat(fPtsToUnit); - SkAutoTUnref<const GrFragmentProcessor> inner( - GrSweepGradient::Create(context, procDataManager, *this, matrix)); - return GrExtractAlphaFragmentProcessor::Create(inner); + *effect = GrSweepGradient::Create(context, procDataManager, *this, matrix); + *paintColor = SkColor2GrColorJustAlpha(paint.getColor()); + + return true; +} + +#else + +bool SkSweepGradient::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; } #endif diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h index 8094a48c79..bc465bdc44 100644 --- a/src/effects/gradients/SkSweepGradient.h +++ b/src/effects/gradients/SkSweepGradient.h @@ -30,10 +30,9 @@ public: GradientType asAGradient(GradientInfo* info) const override; -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM, - const SkMatrix*, SkFilterQuality, GrProcessorDataManager*) const override; -#endif + bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient) diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index d1fa7b005d..41b5c1bbae 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -359,17 +359,31 @@ void SkTwoPointConicalGradient::flatten(SkWriteBuffer& buffer) const { #if SK_SUPPORT_GPU #include "SkGr.h" -#include "effects/GrExtractAlphaFragmentProcessor.h" -const GrFragmentProcessor* SkTwoPointConicalGradient::asFragmentProcessor(GrContext* context, - const SkMatrix& viewM, const SkMatrix* localMatrix, SkFilterQuality, - GrProcessorDataManager* procDataManager) const { +bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext* context, + const SkPaint& paint, + const SkMatrix& viewM, + const SkMatrix* localMatrix, + GrColor* paintColor, + GrProcessorDataManager* procDataManager, + GrFragmentProcessor** fp) const { SkASSERT(context); SkASSERT(fPtsToUnit.isIdentity()); - SkAutoTUnref<const GrFragmentProcessor> inner( - Gr2PtConicalGradientEffect::Create(context, procDataManager, *this, fTileMode, - localMatrix)); - return GrExtractAlphaFragmentProcessor::Create(inner); + + *fp = Gr2PtConicalGradientEffect::Create(context, procDataManager, *this, fTileMode, + localMatrix); + *paintColor = SkColor2GrColorJustAlpha(paint.getColor()); + return true; +} + +#else + +bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext*, const SkPaint&, + const SkMatrix&, const SkMatrix*, + GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const { + SkDEBUGFAIL("Should not call in GPU-less build"); + return false; } #endif diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h index 17ed32b018..8bba9e1b7f 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.h +++ b/src/effects/gradients/SkTwoPointConicalGradient.h @@ -59,10 +59,9 @@ public: }; SkShader::GradientType asAGradient(GradientInfo* info) const override; -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix&, const SkMatrix*, - SkFilterQuality, GrProcessorDataManager*) const override; -#endif + bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*, + GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override; bool isOpaque() const override; SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); } diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index c88e75692c..30f0fdf6a1 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -183,7 +183,7 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(Edge2PtConicalEffect); /* * All Two point conical gradient test create functions may occasionally create edge case shaders */ -const GrFragmentProcessor* Edge2PtConicalEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* Edge2PtConicalEffect::TestCreate(GrProcessorTestData* d) { SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}; SkScalar radius1 = d->fRandom->nextUScalar1(); SkPoint center2; @@ -209,9 +209,12 @@ const GrFragmentProcessor* Edge2PtConicalEffect::TestCreate(GrProcessorTestData* center2, radius2, colors, stops, colorCount, tm)); - const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager); - GrAlwaysAssert(fp); + SkPaint paint; + GrFragmentProcessor* fp; + GrColor paintColor; + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, d->fProcDataManager, &fp)); return fp; } @@ -462,7 +465,7 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(FocalOutside2PtConicalEffect); /* * All Two point conical gradient test create functions may occasionally create edge case shaders */ -const GrFragmentProcessor* FocalOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* FocalOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) { SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}; SkScalar radius1 = 0.f; SkPoint center2; @@ -485,10 +488,15 @@ const GrFragmentProcessor* FocalOutside2PtConicalEffect::TestCreate(GrProcessorT center2, radius2, colors, stops, colorCount, tm)); - const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager); - GrAlwaysAssert(fp); - return fp; + SkPaint paint; + GrFragmentProcessor* effect; + GrColor paintColor; + GrPaint grPaint; + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, d->fProcDataManager, + &effect)); + return effect; } GLFocalOutside2PtConicalEffect::GLFocalOutside2PtConicalEffect(const GrProcessor& processor) @@ -668,7 +676,7 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(FocalInside2PtConicalEffect); /* * All Two point conical gradient test create functions may occasionally create edge case shaders */ -const GrFragmentProcessor* FocalInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* FocalInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) { SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}; SkScalar radius1 = 0.f; SkPoint center2; @@ -693,9 +701,12 @@ const GrFragmentProcessor* FocalInside2PtConicalEffect::TestCreate(GrProcessorTe center2, radius2, colors, stops, colorCount, tm)); - const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager); - GrAlwaysAssert(fp); + SkPaint paint; + GrColor paintColor; + GrFragmentProcessor* fp; + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, d->fProcDataManager, &fp)); return fp; } @@ -912,7 +923,8 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircleInside2PtConicalEffect); /* * All Two point conical gradient test create functions may occasionally create edge case shaders */ -const GrFragmentProcessor* CircleInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* +CircleInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) { SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}; SkScalar radius1 = d->fRandom->nextUScalar1() + 0.0001f; // make sure radius1 != 0 SkPoint center2; @@ -936,9 +948,12 @@ const GrFragmentProcessor* CircleInside2PtConicalEffect::TestCreate(GrProcessorT center2, radius2, colors, stops, colorCount, tm)); - const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager); - GrAlwaysAssert(fp); + SkPaint paint; + GrColor paintColor; + GrFragmentProcessor* fp; + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, d->fProcDataManager, &fp)); return fp; } @@ -1139,7 +1154,7 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircleOutside2PtConicalEffect); /* * All Two point conical gradient test create functions may occasionally create edge case shaders */ -const GrFragmentProcessor* CircleOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* CircleOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) { SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}; SkScalar radius1 = d->fRandom->nextUScalar1() + 0.0001f; // make sure radius1 != 0 SkPoint center2; @@ -1164,10 +1179,12 @@ const GrFragmentProcessor* CircleOutside2PtConicalEffect::TestCreate(GrProcessor center2, radius2, colors, stops, colorCount, tm)); - const GrFragmentProcessor* fp = shader->asFragmentProcessor( - d->fContext,GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, - d->fProcDataManager); - GrAlwaysAssert(fp); + SkPaint paint; + GrColor paintColor; + GrFragmentProcessor* fp; + SkAssertResult(shader->asFragmentProcessor(d->fContext, paint, + GrTest::TestMatrix(d->fRandom), nullptr, + &paintColor, d->fProcDataManager, &fp)); return fp; } diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp index 6023f188df..296f6daf84 100644 --- a/src/gpu/GrAAConvexPathRenderer.cpp +++ b/src/gpu/GrAAConvexPathRenderer.cpp @@ -668,7 +668,7 @@ private: GR_DEFINE_GEOMETRY_PROCESSOR_TEST(QuadEdgeEffect); -const GrGeometryProcessor* QuadEdgeEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* QuadEdgeEffect::TestCreate(GrProcessorTestData* d) { // Doesn't work without derivative instructions. return d->fCaps->shaderCaps()->shaderDerivativeSupport() ? QuadEdgeEffect::Create(GrRandomColor(d->fRandom), diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp index cefc93336e..2017173e6b 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/GrDefaultGeoProcFactory.cpp @@ -251,7 +251,7 @@ private: GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DefaultGeoProc); -const GrGeometryProcessor* DefaultGeoProc::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* DefaultGeoProc::TestCreate(GrProcessorTestData* d) { uint32_t flags = 0; if (d->fRandom->nextBool()) { flags |= kColor_GPFlag; diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index 34d3db8924..e2a4e9a21a 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -203,7 +203,7 @@ private: GR_DEFINE_GEOMETRY_PROCESSOR_TEST(CircleEdgeEffect); -const GrGeometryProcessor* CircleEdgeEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* CircleEdgeEffect::TestCreate(GrProcessorTestData* d) { return CircleEdgeEffect::Create(GrRandomColor(d->fRandom), d->fRandom->nextBool(), GrTest::TestMatrix(d->fRandom), @@ -382,7 +382,7 @@ private: GR_DEFINE_GEOMETRY_PROCESSOR_TEST(EllipseEdgeEffect); -const GrGeometryProcessor* EllipseEdgeEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* EllipseEdgeEffect::TestCreate(GrProcessorTestData* d) { return EllipseEdgeEffect::Create(GrRandomColor(d->fRandom), d->fRandom->nextBool(), GrTest::TestMatrix(d->fRandom), @@ -583,7 +583,7 @@ private: GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DIEllipseEdgeEffect); -const GrGeometryProcessor* DIEllipseEdgeEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* DIEllipseEdgeEffect::TestCreate(GrProcessorTestData* d) { return DIEllipseEdgeEffect::Create(GrRandomColor(d->fRandom), GrTest::TestMatrix(d->fRandom), (Mode)(d->fRandom->nextRangeU(0,2)), diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 4f6d8788b1..7a3335c305 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -241,6 +241,10 @@ bool GrFragmentProcessor::hasSameTransforms(const GrFragmentProcessor& that) con return true; } +void GrFragmentProcessor::computeInvariantOutput(GrInvariantOutput* inout) const { + this->onComputeInvariantOutput(inout); +} + /////////////////////////////////////////////////////////////////////////////////////////////////// // Initial static variable from GrXPFactory diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 4293194de3..ca78ff14e1 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -851,13 +851,22 @@ bool SkPaint2GrPaint(GrContext* context, GrRenderTarget* rt, const SkPaint& skPa GrColor paintColor = SkColor2GrColor(skPaint.getColor()); - const GrFragmentProcessor* fp = shader->asFragmentProcessor(context, viewM, NULL, - skPaint.getFilterQuality(), grPaint->getProcessorDataManager()); - if (!fp) { - return false; + // Start a new block here in order to preserve our context state after calling + // asFragmentProcessor(). Since these calls get passed back to the client, we don't really + // want them messing around with the context. + { + // Allow the shader to modify paintColor and also create an effect to be installed as + // the first color effect on the GrPaint. + GrFragmentProcessor* fp = nullptr; + if (!shader->asFragmentProcessor(context, skPaint, viewM, nullptr, &paintColor, + grPaint->getProcessorDataManager(), &fp)) { + return false; + } + if (fp) { + grPaint->addColorFragmentProcessor(fp)->unref(); + constantColor = false; + } } - grPaint->addColorFragmentProcessor(fp)->unref(); - constantColor = false; // The grcolor is automatically set when calling asFragmentProcessor. // If the shader can be seen as an effect it returns true and adds its effect to the grpaint. diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index 5872992aac..92cf9a2594 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -217,7 +217,7 @@ GrConicEffect::GrConicEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrConicEffect); -const GrGeometryProcessor* GrConicEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* GrConicEffect::TestCreate(GrProcessorTestData* d) { GrGeometryProcessor* gp; do { GrPrimitiveEdgeType edgeType = @@ -425,7 +425,7 @@ GrQuadEffect::GrQuadEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t co GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrQuadEffect); -const GrGeometryProcessor* GrQuadEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* GrQuadEffect::TestCreate(GrProcessorTestData* d) { GrGeometryProcessor* gp; do { GrPrimitiveEdgeType edgeType = static_cast<GrPrimitiveEdgeType>( @@ -645,7 +645,7 @@ GrCubicEffect::GrCubicEffect(GrColor color, const SkMatrix& viewMatrix, GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrCubicEffect); -const GrGeometryProcessor* GrCubicEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* GrCubicEffect::TestCreate(GrProcessorTestData* d) { GrGeometryProcessor* gp; do { GrPrimitiveEdgeType edgeType = diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index d8a9726030..ad9be6bdc7 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -175,7 +175,7 @@ void GrBicubicEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrBicubicEffect); -const GrFragmentProcessor* GrBicubicEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrBicubicEffect::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; SkScalar coefficients[16]; diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 69c2029edb..85d08629ac 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -159,7 +159,7 @@ GrBitmapTextGeoProc::createGLInstance(const GrBatchTracker& bt, GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrBitmapTextGeoProc); -const GrGeometryProcessor* GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; static const SkShader::TileMode kTileModes[] = { diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 3f68268b20..838dc1ccea 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -128,7 +128,7 @@ void GrConfigConversionEffect::onComputeInvariantOutput(GrInvariantOutput* inout GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConfigConversionEffect); -const GrFragmentProcessor* GrConfigConversionEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrConfigConversionEffect::TestCreate(GrProcessorTestData* d) { PMConversion pmConv = static_cast<PMConversion>(d->fRandom->nextULessThan(kPMConversionCnt)); bool swapRB; if (kNone_PMConversion == pmConv) { diff --git a/src/gpu/effects/GrConstColorProcessor.cpp b/src/gpu/effects/GrConstColorProcessor.cpp index 95a4081d4f..131d91c874 100644 --- a/src/gpu/effects/GrConstColorProcessor.cpp +++ b/src/gpu/effects/GrConstColorProcessor.cpp @@ -103,7 +103,7 @@ bool GrConstColorProcessor::onIsEqual(const GrFragmentProcessor& other) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConstColorProcessor); -const GrFragmentProcessor* GrConstColorProcessor::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrConstColorProcessor::TestCreate(GrProcessorTestData* d) { GrColor color; int colorPicker = d->fRandom->nextULessThan(3); switch (colorPicker) { diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp index d1495a3276..2504fd4ccc 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -60,7 +60,7 @@ private: GR_DEFINE_FRAGMENT_PROCESSOR_TEST(AARectEffect); -const GrFragmentProcessor* AARectEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* AARectEffect::TestCreate(GrProcessorTestData* d) { SkRect rect = SkRect::MakeLTRB(d->fRandom->nextSScalar1(), d->fRandom->nextSScalar1(), d->fRandom->nextSScalar1(), @@ -339,7 +339,7 @@ bool GrConvexPolyEffect::onIsEqual(const GrFragmentProcessor& other) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConvexPolyEffect); -const GrFragmentProcessor* GrConvexPolyEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrConvexPolyEffect::TestCreate(GrProcessorTestData* d) { int count = d->fRandom->nextULessThan(kMaxEdges) + 1; SkScalar edges[kMaxEdges * 3]; for (int i = 0; i < 3 * count; ++i) { diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 5fd62b8cdf..f70b664505 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -217,7 +217,7 @@ bool GrConvolutionEffect::onIsEqual(const GrFragmentProcessor& sBase) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConvolutionEffect); -const GrFragmentProcessor* GrConvolutionEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrConvolutionEffect::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; Direction dir = d->fRandom->nextBool() ? kX_Direction : kY_Direction; diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp index 89d7565894..8c45d22727 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.cpp +++ b/src/gpu/effects/GrCoverageSetOpXP.cpp @@ -245,7 +245,7 @@ void GrCoverageSetOpXPFactory::getInvariantBlendedColor(const GrProcOptInfo& col GR_DEFINE_XP_FACTORY_TEST(GrCoverageSetOpXPFactory); -const GrXPFactory* GrCoverageSetOpXPFactory::TestCreate(GrProcessorTestData* d) { +GrXPFactory* GrCoverageSetOpXPFactory::TestCreate(GrProcessorTestData* d) { SkRegion::Op regionOp = SkRegion::Op(d->fRandom->nextULessThan(SkRegion::kLastOp + 1)); bool invertCoverage = d->fRandom->nextBool(); return GrCoverageSetOpXPFactory::Create(regionOp, invertCoverage); diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index f626e7a211..58591e5810 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -506,7 +506,7 @@ void GrCustomXferFP::onComputeInvariantOutput(GrInvariantOutput* inout) const { } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrCustomXferFP); -const GrFragmentProcessor* GrCustomXferFP::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrCustomXferFP::TestCreate(GrProcessorTestData* d) { int mode = d->fRandom->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode); return new GrCustomXferFP(d->fProcDataManager, static_cast<SkXfermode::Mode>(mode), @@ -805,7 +805,7 @@ void GrCustomXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI, } GR_DEFINE_XP_FACTORY_TEST(GrCustomXPFactory); -const GrXPFactory* GrCustomXPFactory::TestCreate(GrProcessorTestData* d) { +GrXPFactory* GrCustomXPFactory::TestCreate(GrProcessorTestData* d) { int mode = d->fRandom->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode); diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 5420dbd167..ed6473796d 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -960,7 +960,7 @@ DashingCircleEffect::DashingCircleEffect(GrColor color, GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingCircleEffect); -const GrGeometryProcessor* DashingCircleEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* DashingCircleEffect::TestCreate(GrProcessorTestData* d) { DashAAMode aaMode = static_cast<DashAAMode>(d->fRandom->nextULessThan(kDashAAModeCount)); return DashingCircleEffect::Create(GrRandomColor(d->fRandom), aaMode, GrTest::TestMatrix(d->fRandom), @@ -1195,7 +1195,7 @@ DashingLineEffect::DashingLineEffect(GrColor color, GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingLineEffect); -const GrGeometryProcessor* DashingLineEffect::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* DashingLineEffect::TestCreate(GrProcessorTestData* d) { DashAAMode aaMode = static_cast<DashAAMode>(d->fRandom->nextULessThan(kDashAAModeCount)); return DashingLineEffect::Create(GrRandomColor(d->fRandom), aaMode, GrTest::TestMatrix(d->fRandom), diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/effects/GrDisableColorXP.cpp index 3e1024b162..caccf10e77 100644 --- a/src/gpu/effects/GrDisableColorXP.cpp +++ b/src/gpu/effects/GrDisableColorXP.cpp @@ -104,7 +104,7 @@ GrDisableColorXPFactory::onCreateXferProcessor(const GrCaps& caps, GR_DEFINE_XP_FACTORY_TEST(GrDisableColorXPFactory); -const GrXPFactory* GrDisableColorXPFactory::TestCreate(GrProcessorTestData*) { +GrXPFactory* GrDisableColorXPFactory::TestCreate(GrProcessorTestData*) { return GrDisableColorXPFactory::Create(); } diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index f29bab5de2..d0c1a3fcd8 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -252,7 +252,7 @@ GrDistanceFieldA8TextGeoProc::createGLInstance(const GrBatchTracker& bt, GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrDistanceFieldA8TextGeoProc); -const GrGeometryProcessor* GrDistanceFieldA8TextGeoProc::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* GrDistanceFieldA8TextGeoProc::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; static const SkShader::TileMode kTileModes[] = { @@ -475,7 +475,7 @@ GrDistanceFieldPathGeoProc::createGLInstance(const GrBatchTracker& bt, const GrG GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrDistanceFieldPathGeoProc); -const GrGeometryProcessor* GrDistanceFieldPathGeoProc::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* GrDistanceFieldPathGeoProc::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; static const SkShader::TileMode kTileModes[] = { @@ -748,7 +748,7 @@ GrDistanceFieldLCDTextGeoProc::createGLInstance(const GrBatchTracker& bt, GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrDistanceFieldLCDTextGeoProc); -const GrGeometryProcessor* GrDistanceFieldLCDTextGeoProc::TestCreate(GrProcessorTestData* d) { +GrGeometryProcessor* GrDistanceFieldLCDTextGeoProc::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; static const SkShader::TileMode kTileModes[] = { diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index 3cff899ac5..19b2994b5e 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -53,7 +53,7 @@ void DitherEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(DitherEffect); -const GrFragmentProcessor* DitherEffect::TestCreate(GrProcessorTestData*) { +GrFragmentProcessor* DitherEffect::TestCreate(GrProcessorTestData*) { return DitherEffect::Create(); } diff --git a/src/gpu/effects/GrExtractAlphaFragmentProcessor.cpp b/src/gpu/effects/GrExtractAlphaFragmentProcessor.cpp deleted file mode 100644 index 3414df2b13..0000000000 --- a/src/gpu/effects/GrExtractAlphaFragmentProcessor.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "effects/GrExtractAlphaFragmentProcessor.h" -#include "gl/GrGLFragmentProcessor.h" -#include "gl/builders/GrGLProgramBuilder.h" - -class GLExtractAlphaFragmentProcessor : public GrGLFragmentProcessor { -public: - GLExtractAlphaFragmentProcessor() {} - - void emitCode(EmitArgs& args) override { - GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); - fsBuilder->codeAppendf("vec4 alpha4 = %s.aaaa;", args.fInputColor); - SkString output; - this->emitChild(0, "alpha4", &output, args); - fsBuilder->codeAppendf("%s = %s;", args.fOutputColor, output.c_str()); - } - -private: - typedef GrGLFragmentProcessor INHERITED; -}; - -GrGLFragmentProcessor* GrExtractAlphaFragmentProcessor::onCreateGLInstance() const { - return SkNEW(GLExtractAlphaFragmentProcessor); -} - -void GrExtractAlphaFragmentProcessor::onGetGLProcessorKey(const GrGLSLCaps&, - GrProcessorKeyBuilder*) const { -} - -bool GrExtractAlphaFragmentProcessor::onIsEqual(const GrFragmentProcessor&) const { return true; } - -void GrExtractAlphaFragmentProcessor::onComputeInvariantOutput(GrInvariantOutput* inout) const { - if (inout->validFlags() & kA_GrColorComponentFlag) { - GrColor color = GrColorPackA4(GrColorUnpackA(inout->color())); - inout->setToOther(kRGBA_GrColorComponentFlags, color, - GrInvariantOutput::kWill_ReadInput); - } else { - inout->setToUnknown(GrInvariantOutput::kWill_ReadInput); - } - this->childProcessor(0).computeInvariantOutput(inout); -} diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index 76fa6420ab..c5a7fb7836 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -222,7 +222,7 @@ GrMatrixConvolutionEffect::CreateGaussian(GrProcessorDataManager* procDataManage GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrMatrixConvolutionEffect); -const GrFragmentProcessor* GrMatrixConvolutionEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrMatrixConvolutionEffect::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; int width = d->fRandom->nextRangeU(1, MAX_KERNEL_SIZE); diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 42b71ade9e..0f3df7d66c 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -75,7 +75,7 @@ bool CircleEffect::onIsEqual(const GrFragmentProcessor& other) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircleEffect); -const GrFragmentProcessor* CircleEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* CircleEffect::TestCreate(GrProcessorTestData* d) { SkPoint center; center.fX = d->fRandom->nextRangeScalar(0.f, 1000.f); center.fY = d->fRandom->nextRangeScalar(0.f, 1000.f); @@ -245,7 +245,7 @@ bool EllipseEffect::onIsEqual(const GrFragmentProcessor& other) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(EllipseEffect); -const GrFragmentProcessor* EllipseEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* EllipseEffect::TestCreate(GrProcessorTestData* d) { SkPoint center; center.fX = d->fRandom->nextRangeScalar(0.f, 1000.f); center.fY = d->fRandom->nextRangeScalar(0.f, 1000.f); diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index 5f34f75854..4c9af42cde 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -755,7 +755,7 @@ bool GrPorterDuffXPFactory::willReadDstColor(const GrCaps& caps, GR_DEFINE_XP_FACTORY_TEST(GrPorterDuffXPFactory); -const GrXPFactory* GrPorterDuffXPFactory::TestCreate(GrProcessorTestData* d) { +GrXPFactory* GrPorterDuffXPFactory::TestCreate(GrProcessorTestData* d) { SkXfermode::Mode mode = SkXfermode::Mode(d->fRandom->nextULessThan(SkXfermode::kLastCoeffMode)); return GrPorterDuffXPFactory::Create(mode); } diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index b5b95679f5..af0f1fc8fd 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -107,7 +107,7 @@ bool CircularRRectEffect::onIsEqual(const GrFragmentProcessor& other) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircularRRectEffect); -const GrFragmentProcessor* CircularRRectEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* CircularRRectEffect::TestCreate(GrProcessorTestData* d) { SkScalar w = d->fRandom->nextRangeScalar(20.f, 1000.f); SkScalar h = d->fRandom->nextRangeScalar(20.f, 1000.f); SkScalar r = d->fRandom->nextRangeF(kRadiusMin, 9.f); @@ -432,7 +432,7 @@ bool EllipticalRRectEffect::onIsEqual(const GrFragmentProcessor& other) const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(EllipticalRRectEffect); -const GrFragmentProcessor* EllipticalRRectEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* EllipticalRRectEffect::TestCreate(GrProcessorTestData* d) { SkScalar w = d->fRandom->nextRangeScalar(20.f, 1000.f); SkScalar h = d->fRandom->nextRangeScalar(20.f, 1000.f); SkVector r[4]; diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index 68e501c5aa..fb7c3a7b23 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -50,7 +50,7 @@ GrGLFragmentProcessor* GrSimpleTextureEffect::onCreateGLInstance() const { GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSimpleTextureEffect); -const GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; static const SkShader::TileMode kTileModes[] = { diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 93a548a047..c1f9ef03a9 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -280,7 +280,7 @@ void GrTextureDomainEffect::onComputeInvariantOutput(GrInvariantOutput* inout) c GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrTextureDomainEffect); -const GrFragmentProcessor* GrTextureDomainEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrTextureDomainEffect::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; SkRect domain; |