Rename MakeResult so that it can be used more broadly.
MakeResult will be needed when migrating `asFragmentProcessor` calls.
However, the typename previously could not be forward-declared because
it was a type buried inside a class. Also, the name `MakeResult` seems
too tightly-coupled to the `Make` functions.
The type has been renamed to `GrFPResult` and moved out of
GrFragmentProcessor to allow `asFragmentProcessor` to use it without
actually #including GrFragmentProcessor.
Change-Id: Ic2c701b943aa64e0f922827b60084e58c67bfb8d
Bug: skia:10217
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298740
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
diff --git a/src/gpu/effects/generated/GrCircleEffect.cpp b/src/gpu/effects/generated/GrCircleEffect.cpp
index 8935ca6..f9df3c9 100644
--- a/src/gpu/effects/generated/GrCircleEffect.cpp
+++ b/src/gpu/effects/generated/GrCircleEffect.cpp
@@ -48,12 +48,12 @@
args.fUniformHandler->getUniformCStr(circleVar),
args.fUniformHandler->getUniformCStr(circleVar),
args.fUniformHandler->getUniformCStr(circleVar));
- SkString _input2566(args.fInputColor);
- SkString _sample2566;
+ SkString _input2509(args.fInputColor);
+ SkString _sample2509;
if (_outer.inputFP_index >= 0) {
- _sample2566 = this->invokeChild(_outer.inputFP_index, _input2566.c_str(), args);
+ _sample2509 = this->invokeChild(_outer.inputFP_index, _input2509.c_str(), args);
} else {
- _sample2566.swap(_input2566);
+ _sample2509.swap(_input2509);
}
fragBuilder->codeAppendf(
R"SkSL(
@@ -64,7 +64,7 @@
%s = d > 0.5 ? inputColor : half4(0.0);
}
)SkSL",
- _sample2566.c_str(), (int)_outer.edgeType, (int)_outer.edgeType, args.fOutputColor,
+ _sample2509.c_str(), (int)_outer.edgeType, (int)_outer.edgeType, args.fOutputColor,
args.fOutputColor);
}