AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove coverage-as-alpha flag from GrAlphaThresholdFP

Browse Source 
Don't sort thresholds and allow full 0..1 range

Change-Id: I228be036bb259bea53ac9885e758c9e46ced1d62
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296717
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
This commit is contained in:
Brian Salomon 2020-06-16 09:46:17 -04:00 committed by Skia Commit-Bot
parent ca72cad601
commit 4569f66309
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gpu/effects/GrAlphaThresholdFragmentProcessor.fp
View File

@ -12,8 +12,7 @@ in uniform half outerThreshold;
@optimizationFlags {
(inputFP ? ProcessorOptimizationFlags(inputFP.get()) : kAll_OptimizationFlags) &
(kCompatibleWithCoverageAsAlpha_OptimizationFlag |
((outerThreshold >= 1.0) ? kPreservesOpaqueInput_OptimizationFlag : kNone_OptimizationFlags))
((outerThreshold >= 1.0) ? kPreservesOpaqueInput_OptimizationFlag : kNone_OptimizationFlags)
}
void main() {
@ -34,10 +33,9 @@ void main() {
}
@test(testData) {
auto [maskView, ct, at] = testData->randomAlphaOnlyView();
// Make the inner and outer thresholds be in (0, 1) exclusive and be sorted correctly.
float innerThresh = testData->fRandom->nextUScalar1() * .99f + 0.005f;
float outerThresh = testData->fRandom->nextUScalar1() * .99f + 0.005f;
// Make the inner and outer thresholds be in [0, 1].
float outerThresh = testData->fRandom->nextUScalar1();
float innerThresh = testData->fRandom->nextUScalar1();
std::unique_ptr<GrFragmentProcessor> inputChild, maskChild;
if (testData->fRandom->nextBool()) {
inputChild = GrProcessorUnitTest::MakeChildFP(testData);

23
src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp
View File

@ -32,23 +32,23 @@ public:
kHalf_GrSLType, "innerThreshold");
outerThresholdVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
kHalf_GrSLType, "outerThreshold");
SkString _input572 = SkStringPrintf("%s", args.fInputColor);
SkString _sample572;
SkString _input515 = SkStringPrintf("%s", args.fInputColor);
SkString _sample515;
if (_outer.inputFP_index >= 0) {
_sample572 = this->invokeChild(_outer.inputFP_index, _input572.c_str(), args);
_sample515 = this->invokeChild(_outer.inputFP_index, _input515.c_str(), args);
} else {
_sample572 = _input572;
_sample515 = _input515;
}
fragBuilder->codeAppendf("half4 color = %s;", _sample572.c_str());
SkString _sample624;
_sample624 = this->invokeChild(_outer.maskFP_index, args);
fragBuilder->codeAppendf("half4 color = %s;", _sample515.c_str());
SkString _sample567;
_sample567 = this->invokeChild(_outer.maskFP_index, args);
fragBuilder->codeAppendf(
"\nhalf4 mask_color = %s;\nif (mask_color.w < 0.5) {\n if (color.w > %s) {\n "
" half scale = %s / color.w;\n color.xyz *= scale;\n color.w = "
"%s;\n }\n} else if (color.w < %s) {\n half scale = %s / "
"max(0.0010000000474974513, color.w);\n color.xyz *= scale;\n color.w = "
"%s;\n}\n%s = color;\n",
_sample624.c_str(), args.fUniformHandler->getUniformCStr(outerThresholdVar),
_sample567.c_str(), args.fUniformHandler->getUniformCStr(outerThresholdVar),
args.fUniformHandler->getUniformCStr(outerThresholdVar),
args.fUniformHandler->getUniformCStr(outerThresholdVar),
args.fUniformHandler->getUniformCStr(innerThresholdVar),
@ -98,10 +98,9 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrAlphaThresholdFragmentProcessor);
#if GR_TEST_UTILS
std::unique_ptr<GrFragmentProcessor> GrAlphaThresholdFragmentProcessor::TestCreate(
GrProcessorTestData* testData) {
auto[maskView, ct, at] = testData->randomAlphaOnlyView();
// Make the inner and outer thresholds be in (0, 1) exclusive and be sorted correctly.
float innerThresh = testData->fRandom->nextUScalar1() * .99f + 0.005f;
float outerThresh = testData->fRandom->nextUScalar1() * .99f + 0.005f;
// Make the inner and outer thresholds be in [0, 1].
float outerThresh = testData->fRandom->nextUScalar1();
float innerThresh = testData->fRandom->nextUScalar1();
std::unique_ptr<GrFragmentProcessor> inputChild, maskChild;
if (testData->fRandom->nextBool()) {
inputChild = GrProcessorUnitTest::MakeChildFP(testData);

3
src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h
View File

@ -42,9 +42,8 @@ private:
: INHERITED(kGrAlphaThresholdFragmentProcessor_ClassID,
(OptimizationFlags)(inputFP ? ProcessorOptimizationFlags(inputFP.get())
: kAll_OptimizationFlags) &
(kCompatibleWithCoverageAsAlpha_OptimizationFlag |
((outerThreshold >= 1.0) ? kPreservesOpaqueInput_OptimizationFlag
: kNone_OptimizationFlags)))
: kNone_OptimizationFlags))
, innerThreshold(innerThreshold)
, outerThreshold(outerThreshold) {
if (inputFP) {