Remove unused premul/unpremul FP code
Bug: skia:
Change-Id: I911ee066ce4d0175cee3ee3868a86955d486687c
Reviewed-on: https://skia-review.googlesource.com/159060
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index fb8ffb2..c3ce355 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -525,7 +525,7 @@
GrPaint paint;
paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
auto fp = fContext->createUPMToPMEffect(
- GrSimpleTextureEffect::Make(std::move(tempProxy), SkMatrix::I()), true);
+ GrSimpleTextureEffect::Make(std::move(tempProxy), SkMatrix::I()));
if (srcColorType == GrColorType::kBGRA_8888) {
fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), GrSwizzle::BGRA());
}
@@ -696,8 +696,7 @@
paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
auto fp = fContext->createPMToUPMEffect(
GrSimpleTextureEffect::Make(sk_ref_sp(srcProxy->asTextureProxy()),
- SkMatrix::I()),
- true);
+ SkMatrix::I()));
if (dstColorType == GrColorType::kBGRA_8888) {
fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), GrSwizzle::BGRA());
dstColorType = GrColorType::kRGBA_8888;
@@ -1053,39 +1052,25 @@
}
std::unique_ptr<GrFragmentProcessor> GrContext::createPMToUPMEffect(
- std::unique_ptr<GrFragmentProcessor> fp, bool useConfigConversionEffect) {
+ std::unique_ptr<GrFragmentProcessor> fp) {
ASSERT_SINGLE_OWNER
- // We have specialized effects that guarantee round-trip conversion for some formats
- if (useConfigConversionEffect) {
- // We should have already called this->validPMUPMConversionExists() in this case
- SkASSERT(fDidTestPMConversions);
- // ...and it should have succeeded
- SkASSERT(this->validPMUPMConversionExists());
+ // We should have already called this->validPMUPMConversionExists() in this case
+ SkASSERT(fDidTestPMConversions);
+ // ...and it should have succeeded
+ SkASSERT(this->validPMUPMConversionExists());
- return GrConfigConversionEffect::Make(std::move(fp), PMConversion::kToUnpremul);
- } else {
- // For everything else (sRGB, half-float, etc...), it doesn't make sense to try and
- // explicitly round the results. Just do the obvious, naive thing in the shader.
- return GrFragmentProcessor::UnpremulOutput(std::move(fp));
- }
+ return GrConfigConversionEffect::Make(std::move(fp), PMConversion::kToUnpremul);
}
std::unique_ptr<GrFragmentProcessor> GrContext::createUPMToPMEffect(
- std::unique_ptr<GrFragmentProcessor> fp, bool useConfigConversionEffect) {
+ std::unique_ptr<GrFragmentProcessor> fp) {
ASSERT_SINGLE_OWNER
- // We have specialized effects that guarantee round-trip conversion for these formats
- if (useConfigConversionEffect) {
- // We should have already called this->validPMUPMConversionExists() in this case
- SkASSERT(fDidTestPMConversions);
- // ...and it should have succeeded
- SkASSERT(this->validPMUPMConversionExists());
+ // We should have already called this->validPMUPMConversionExists() in this case
+ SkASSERT(fDidTestPMConversions);
+ // ...and it should have succeeded
+ SkASSERT(this->validPMUPMConversionExists());
- return GrConfigConversionEffect::Make(std::move(fp), PMConversion::kToPremul);
- } else {
- // For everything else (sRGB, half-float, etc...), it doesn't make sense to try and
- // explicitly round the results. Just do the obvious, naive thing in the shader.
- return GrFragmentProcessor::PremulOutput(std::move(fp));
- }
+ return GrConfigConversionEffect::Make(std::move(fp), PMConversion::kToPremul);
}
bool GrContext::validPMUPMConversionExists() {