Remove XP override color.
The only use case for this was using the blend constant for LCD text. Now instead of overriding the op's color with an alpha we upload the alpha as a uniform.
This also removes two unused parameters from GrXferProcessor::getOptimizations.
Change-Id: I8268da9904a5d26649c6ae81a5705b0930893904
Reviewed-on: https://skia-review.googlesource.com/9221
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index c1d73ef..89067cf 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -71,8 +71,7 @@
fReadsDst = GrXPFactory::WillReadDst(xpf, analysis);
sk_sp<GrXferProcessor> xp(xpf->createXferProcessor(analysis, false, nullptr, caps));
TEST_ASSERT(!GrXPFactory::WillNeedDstTexture(xpf, caps, analysis));
- GrColor ignoredOverrideColor;
- fOptFlags = xp->getOptimizations(analysis, false, &ignoredOverrideColor, caps);
+ fOptFlags = xp->getOptimizations(analysis);
GetXPOutputTypes(xp.get(), &fPrimaryOutputType, &fSecondaryOutputType);
xp->getBlendInfo(&fBlendInfo);
TEST_ASSERT(!xp->willReadDstColor());
@@ -986,8 +985,7 @@
TEST_ASSERT(GrXPFactory::WillReadDst(xpf, analysis));
- GrColor overrideColor;
- xp->getOptimizations(analysis, false, &overrideColor, caps);
+ xp->getOptimizations(analysis);
GrXferProcessor::BlendInfo blendInfo;
xp->getBlendInfo(&blendInfo);
@@ -1047,8 +1045,7 @@
return;
}
TEST_ASSERT(!xp->hasSecondaryOutput());
- GrColor ignoredOverrideColor;
- xp->getOptimizations(analysis, false, &ignoredOverrideColor, caps);
+ xp->getOptimizations(analysis);
TEST_ASSERT(!xp->hasSecondaryOutput());
}
}