From 1c10fddd1f563412f501e49db1d21844c4d5b058 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 3 Mar 2017 14:30:15 -0500 Subject: 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 Reviewed-by: Greg Daniel --- tests/GrPorterDuffTest.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tests/GrPorterDuffTest.cpp') diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index c1d73ef251..89067cfe69 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -71,8 +71,7 @@ public: fReadsDst = GrXPFactory::WillReadDst(xpf, analysis); sk_sp 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 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const 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 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { return; } TEST_ASSERT(!xp->hasSecondaryOutput()); - GrColor ignoredOverrideColor; - xp->getOptimizations(analysis, false, &ignoredOverrideColor, caps); + xp->getOptimizations(analysis); TEST_ASSERT(!xp->hasSecondaryOutput()); } } -- cgit v1.2.3