diff options
author | Brian Osman <brianosman@google.com> | 2017-03-23 16:24:50 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-24 01:24:57 +0000 |
commit | 3e7cddaf32e280fe9f32eec5bfdd8168ca4941b6 (patch) | |
tree | 4bfdb3ad5b44044113d3d6b586e10281d3987c9e /src | |
parent | da4545bfc58f8ec19df79f6ae75b7231477973d8 (diff) |
Remove texture sampling from GrConfigConversionEffect
Re-land fixed version of https://skia-review.googlesource.com/c/10026/
BUG=skia:
Change-Id: I0754ffb72da2966eb57e5cd7ec818b1cdce84a74
Reviewed-on: https://skia-review.googlesource.com/10056
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/GrContext.cpp | 48 | ||||
-rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 88 | ||||
-rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.h | 22 |
3 files changed, 56 insertions, 102 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 56d811761b..f6302a9a1e 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -870,18 +870,18 @@ sk_sp<GrFragmentProcessor> GrContext::createPMToUPMEffect(GrTexture* texture, ASSERT_SINGLE_OWNER // We should have already called this->testPMConversionsIfNecessary(). SkASSERT(fDidTestPMConversions); - if (kRGBA_half_GrPixelConfig == texture->config()) { - return GrFragmentProcessor::UnpremulOutput( - GrSimpleTextureEffect::Make(texture, nullptr, matrix)); - } else { + GrPixelConfig config = texture->config(); + sk_sp<GrFragmentProcessor> fp = GrSimpleTextureEffect::Make(texture, nullptr, matrix); + if (kRGBA_half_GrPixelConfig == config) { + return GrFragmentProcessor::UnpremulOutput(std::move(fp)); + } else if (kRGBA_8888_GrPixelConfig == config || kBGRA_8888_GrPixelConfig == config) { GrConfigConversionEffect::PMConversion pmToUPM = static_cast<GrConfigConversionEffect::PMConversion>(fPMToUPMConversion); if (GrConfigConversionEffect::kPMConversionCnt != pmToUPM) { - return GrConfigConversionEffect::Make(texture, pmToUPM, matrix); - } else { - return nullptr; + return GrConfigConversionEffect::Make(std::move(fp), pmToUPM); } } + return nullptr; } sk_sp<GrFragmentProcessor> GrContext::createPMToUPMEffect(sk_sp<GrTextureProxy> proxy, @@ -889,20 +889,19 @@ sk_sp<GrFragmentProcessor> GrContext::createPMToUPMEffect(sk_sp<GrTextureProxy> ASSERT_SINGLE_OWNER // We should have already called this->testPMConversionsIfNecessary(). SkASSERT(fDidTestPMConversions); - if (kRGBA_half_GrPixelConfig == proxy->config()) { - return GrFragmentProcessor::UnpremulOutput( - GrSimpleTextureEffect::Make(this->resourceProvider(), std::move(proxy), - nullptr, matrix)); - } else { + GrPixelConfig config = proxy->config(); + sk_sp<GrFragmentProcessor> fp = GrSimpleTextureEffect::Make(this->resourceProvider(), + std::move(proxy), nullptr, matrix); + if (kRGBA_half_GrPixelConfig == config) { + return GrFragmentProcessor::UnpremulOutput(std::move(fp)); + } else if (kRGBA_8888_GrPixelConfig == config || kBGRA_8888_GrPixelConfig == config) { GrConfigConversionEffect::PMConversion pmToUPM = static_cast<GrConfigConversionEffect::PMConversion>(fPMToUPMConversion); if (GrConfigConversionEffect::kPMConversionCnt != pmToUPM) { - return GrConfigConversionEffect::Make(this->resourceProvider(), std::move(proxy), - pmToUPM, matrix); - } else { - return nullptr; + return GrConfigConversionEffect::Make(std::move(fp), pmToUPM); } } + return nullptr; } sk_sp<GrFragmentProcessor> GrContext::createUPMToPMEffect(sk_sp<GrTextureProxy> proxy, @@ -910,20 +909,19 @@ sk_sp<GrFragmentProcessor> GrContext::createUPMToPMEffect(sk_sp<GrTextureProxy> ASSERT_SINGLE_OWNER // We should have already called this->testPMConversionsIfNecessary(). SkASSERT(fDidTestPMConversions); - if (kRGBA_half_GrPixelConfig == proxy->config()) { - return GrFragmentProcessor::PremulOutput( - GrSimpleTextureEffect::Make(this->resourceProvider(), std::move(proxy), - nullptr, matrix)); - } else { + GrPixelConfig config = proxy->config(); + sk_sp<GrFragmentProcessor> fp = GrSimpleTextureEffect::Make(this->resourceProvider(), + std::move(proxy), nullptr, matrix); + if (kRGBA_half_GrPixelConfig == config) { + return GrFragmentProcessor::PremulOutput(std::move(fp)); + } else if (kRGBA_8888_GrPixelConfig == config || kBGRA_8888_GrPixelConfig == config) { GrConfigConversionEffect::PMConversion upmToPM = static_cast<GrConfigConversionEffect::PMConversion>(fUPMToPMConversion); if (GrConfigConversionEffect::kPMConversionCnt != upmToPM) { - return GrConfigConversionEffect::Make(this->resourceProvider(), std::move(proxy), - upmToPM, matrix); - } else { - return nullptr; + return GrConfigConversionEffect::Make(std::move(fp), upmToPM); } } + return nullptr; } bool GrContext::validPMUPMConversionExists(GrPixelConfig config) const { diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 2c6589d6aa..b2c9e3e4fd 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -10,7 +10,6 @@ #include "GrClip.h" #include "GrContext.h" #include "GrRenderTargetContext.h" -#include "GrSimpleTextureEffect.h" #include "SkMatrix.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" @@ -30,10 +29,11 @@ public: fragBuilder->codeAppendf("%s;", tmpDecl.c_str()); - fragBuilder->codeAppendf("%s = ", tmpVar.c_str()); - fragBuilder->appendTextureLookup(args.fTexSamplers[0], args.fTransformedCoords[0].c_str(), - args.fTransformedCoords[0].getType()); - fragBuilder->codeAppend(";"); + if (nullptr == args.fInputColor) { + // could optimize this case, but we aren't for now. + args.fInputColor = "vec4(1)"; + } + fragBuilder->codeAppendf("%s = %s;", tmpVar.c_str(), args.fInputColor); switch (pmConversion) { case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion: @@ -68,10 +68,6 @@ public: break; } fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, tmpVar.c_str()); - - SkString modulate; - GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor); - fragBuilder->codeAppend(modulate.c_str()); } static inline void GenKey(const GrProcessor& processor, const GrShaderCaps&, @@ -87,29 +83,11 @@ private: }; /////////////////////////////////////////////////////////////////////////////// -GrConfigConversionEffect::GrConfigConversionEffect(GrTexture* texture, - PMConversion pmConversion, - const SkMatrix& matrix) - : INHERITED(texture, nullptr, matrix, kNone_OptimizationFlags) - , fPMConversion(pmConversion) { - this->initClassID<GrConfigConversionEffect>(); - // We expect to get here with non-BGRA/RGBA only if we're doing not doing a premul/unpremul - // conversion. - SkASSERT(kRGBA_8888_GrPixelConfig == texture->config() || - kBGRA_8888_GrPixelConfig == texture->config()); -} -GrConfigConversionEffect::GrConfigConversionEffect(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, - PMConversion pmConversion, - const SkMatrix& matrix) - : INHERITED(resourceProvider, kNone_OptimizationFlags, proxy, nullptr, matrix) +GrConfigConversionEffect::GrConfigConversionEffect(PMConversion pmConversion) + : INHERITED(kNone_OptimizationFlags) , fPMConversion(pmConversion) { this->initClassID<GrConfigConversionEffect>(); - // We expect to get here with non-BGRA/RGBA only if we're doing not doing a premul/unpremul - // conversion. - SkASSERT(kRGBA_8888_GrPixelConfig == proxy->config() || - kBGRA_8888_GrPixelConfig == proxy->config()); } bool GrConfigConversionEffect::onIsEqual(const GrFragmentProcessor& s) const { @@ -130,10 +108,7 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConfigConversionEffect); #if GR_TEST_UTILS sk_sp<GrFragmentProcessor> GrConfigConversionEffect::TestCreate(GrProcessorTestData* d) { PMConversion pmConv = static_cast<PMConversion>(d->fRandom->nextULessThan(kPMConversionCnt)); - return sk_sp<GrFragmentProcessor>(new GrConfigConversionEffect( - d->resourceProvider(), - d->textureProxy(GrProcessorUnitTest::kSkiaPMTextureIdx), - pmConv, GrTest::TestMatrix(d->fRandom))); + return sk_sp<GrFragmentProcessor>(new GrConfigConversionEffect(pmConv)); } #endif @@ -226,14 +201,11 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context GrPaint paint1; GrPaint paint2; GrPaint paint3; - sk_sp<GrFragmentProcessor> pmToUPM1(new GrConfigConversionEffect( - resourceProvider, dataProxy, *pmToUPMRule, SkMatrix::I())); - sk_sp<GrFragmentProcessor> upmToPM(new GrConfigConversionEffect( - resourceProvider, readRTC->asTextureProxyRef(), *upmToPMRule, SkMatrix::I())); - sk_sp<GrFragmentProcessor> pmToUPM2(new GrConfigConversionEffect( - resourceProvider, tempRTC->asTextureProxyRef(), *pmToUPMRule, SkMatrix::I())); - - paint1.addColorFragmentProcessor(std::move(pmToUPM1)); + sk_sp<GrFragmentProcessor> pmToUPM(new GrConfigConversionEffect(*pmToUPMRule)); + sk_sp<GrFragmentProcessor> upmToPM(new GrConfigConversionEffect(*upmToPMRule)); + + paint1.addColorTextureProcessor(resourceProvider, dataProxy, nullptr, SkMatrix::I()); + paint1.addColorFragmentProcessor(pmToUPM); paint1.setPorterDuffXPFactory(SkBlendMode::kSrc); readRTC->fillRectToRect(GrNoClip(), std::move(paint1), GrAA::kNo, SkMatrix::I(), kDstRect, @@ -243,13 +215,17 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context continue; } + paint2.addColorTextureProcessor(resourceProvider, readRTC->asTextureProxyRef(), nullptr, + SkMatrix::I()); paint2.addColorFragmentProcessor(std::move(upmToPM)); paint2.setPorterDuffXPFactory(SkBlendMode::kSrc); tempRTC->fillRectToRect(GrNoClip(), std::move(paint2), GrAA::kNo, SkMatrix::I(), kDstRect, kSrcRect); - paint3.addColorFragmentProcessor(std::move(pmToUPM2)); + paint3.addColorTextureProcessor(resourceProvider, tempRTC->asTextureProxyRef(), nullptr, + SkMatrix::I()); + paint3.addColorFragmentProcessor(std::move(pmToUPM)); paint3.setPorterDuffXPFactory(SkBlendMode::kSrc); readRTC->fillRectToRect(GrNoClip(), std::move(paint3), GrAA::kNo, SkMatrix::I(), kDstRect, @@ -275,28 +251,12 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context } } -sk_sp<GrFragmentProcessor> GrConfigConversionEffect::Make(GrTexture* texture, - PMConversion pmConversion, - const SkMatrix& matrix) { - if (kRGBA_8888_GrPixelConfig != texture->config() && - kBGRA_8888_GrPixelConfig != texture->config()) { - // The PM conversions assume colors are 0..255 - return nullptr; - } - return sk_sp<GrFragmentProcessor>( - new GrConfigConversionEffect(texture, pmConversion, matrix)); -} - -sk_sp<GrFragmentProcessor> GrConfigConversionEffect::Make(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, - PMConversion pmConversion, - const SkMatrix& matrix) { - if (kRGBA_8888_GrPixelConfig != proxy->config() && - kBGRA_8888_GrPixelConfig != proxy->config()) { - // The PM conversions assume colors are 0..255 +sk_sp<GrFragmentProcessor> GrConfigConversionEffect::Make(sk_sp<GrFragmentProcessor> fp, + PMConversion pmConversion) { + if (!fp) { return nullptr; } - return sk_sp<GrFragmentProcessor>(new GrConfigConversionEffect(resourceProvider, - std::move(proxy), - pmConversion, matrix)); + sk_sp<GrFragmentProcessor> ccFP(new GrConfigConversionEffect(pmConversion)); + sk_sp<GrFragmentProcessor> fpPipeline[] = { fp, ccFP }; + return GrFragmentProcessor::RunInSeries(fpPipeline, 2); } diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index d71b228a7b..e5fa10cd9b 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -8,15 +8,13 @@ #ifndef GrConfigConversionEffect_DEFINED #define GrConfigConversionEffect_DEFINED -#include "GrSingleTextureEffect.h" - -class GrInvariantOutput; +#include "GrFragmentProcessor.h" /** * This class is used to perform config conversions. Clients may want to read/write data that is * unpremultiplied. */ -class GrConfigConversionEffect : public GrSingleTextureEffect { +class GrConfigConversionEffect : public GrFragmentProcessor { public: /** * The PM->UPM or UPM->PM conversions to apply. @@ -30,10 +28,11 @@ public: kPMConversionCnt }; - static sk_sp<GrFragmentProcessor> Make(GrTexture*, PMConversion, const SkMatrix&); - - static sk_sp<GrFragmentProcessor> Make(GrResourceProvider*, sk_sp<GrTextureProxy>, - PMConversion, const SkMatrix&); + /** + * Returns a fragment processor that calls the passed in fragment processor, and then performs + * the requested premul or unpremul conversion. + */ + static sk_sp<GrFragmentProcessor> Make(sk_sp<GrFragmentProcessor>, PMConversion); const char* name() const override { return "Config Conversion"; } @@ -48,10 +47,7 @@ public: PMConversion* PMToUPMRule, PMConversion* UPMToPMRule); private: - GrConfigConversionEffect(GrTexture*, PMConversion, const SkMatrix& matrix); - - GrConfigConversionEffect(GrResourceProvider*, sk_sp<GrTextureProxy>, - PMConversion, const SkMatrix& matrix); + GrConfigConversionEffect(PMConversion); GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; @@ -63,7 +59,7 @@ private: GR_DECLARE_FRAGMENT_PROCESSOR_TEST; - typedef GrSingleTextureEffect INHERITED; + typedef GrFragmentProcessor INHERITED; }; #endif |