Reformat generated files with bin-packing off.
Housekeeper-PerCommit-GeneratedFiles has been complaining due to
http://review.skia.org/379656
Change-Id: Id6689261b6e1fbb444730babd52ccfcbd9929e21
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379738
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
diff --git a/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
index af4356a..745191d 100644
--- a/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
+++ b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
@@ -39,8 +39,8 @@
(void)isNativelyFocal;
auto focalParams = _outer.focalParams;
(void)focalParams;
- focalParamsVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
- kHalf2_GrSLType, "focalParams");
+ focalParamsVar = args.fUniformHandler->addUniform(
+ &_outer, kFragment_GrShaderFlag, kHalf2_GrSLType, "focalParams");
fragBuilder->codeAppendf(
R"SkSL(float t = -1.0;
half v = 1.0;
@@ -111,21 +111,37 @@
}
return half4(half(t), v, 0.0, 0.0);
)SkSL",
- (int)_outer.type, args.fUniformHandler->getUniformCStr(focalParamsVar),
- args.fSampleCoord, args.fSampleCoord, args.fSampleCoord,
+ (int)_outer.type,
args.fUniformHandler->getUniformCStr(focalParamsVar),
- (_outer.isRadiusIncreasing ? "true" : "false"), args.fSampleCoord,
- args.fSampleCoord, args.fUniformHandler->getUniformCStr(focalParamsVar),
+ args.fSampleCoord,
+ args.fSampleCoord,
+ args.fSampleCoord,
args.fUniformHandler->getUniformCStr(focalParamsVar),
- (_outer.isFocalOnCircle ? "true" : "false"), args.fSampleCoord, args.fSampleCoord,
- args.fSampleCoord, (_outer.isWellBehaved ? "true" : "false"), args.fSampleCoord,
- args.fSampleCoord, args.fSampleCoord, args.fSampleCoord, args.fSampleCoord,
- args.fSampleCoord, (_outer.isSwapped ? "true" : "false"),
- (_outer.isRadiusIncreasing ? "true" : "false"), args.fSampleCoord,
- args.fSampleCoord, (_outer.isWellBehaved ? "true" : "false"),
+ (_outer.isRadiusIncreasing ? "true" : "false"),
+ args.fSampleCoord,
+ args.fSampleCoord,
+ args.fUniformHandler->getUniformCStr(focalParamsVar),
+ args.fUniformHandler->getUniformCStr(focalParamsVar),
+ (_outer.isFocalOnCircle ? "true" : "false"),
+ args.fSampleCoord,
+ args.fSampleCoord,
+ args.fSampleCoord,
+ (_outer.isWellBehaved ? "true" : "false"),
+ args.fSampleCoord,
+ args.fSampleCoord,
+ args.fSampleCoord,
+ args.fSampleCoord,
+ args.fSampleCoord,
+ args.fSampleCoord,
+ (_outer.isSwapped ? "true" : "false"),
+ (_outer.isRadiusIncreasing ? "true" : "false"),
+ args.fSampleCoord,
+ args.fSampleCoord,
+ (_outer.isWellBehaved ? "true" : "false"),
(_outer.isRadiusIncreasing ? "true" : "false"),
(_outer.isNativelyFocal ? "true" : "false"),
- (_outer.isNativelyFocal ? "true" : "false"), (_outer.isSwapped ? "true" : "false"));
+ (_outer.isNativelyFocal ? "true" : "false"),
+ (_outer.isSwapped ? "true" : "false"));
}
private:
@@ -190,9 +206,13 @@
return SkStringPrintf(
"(type=%d, isRadiusIncreasing=%s, isFocalOnCircle=%s, isWellBehaved=%s, isSwapped=%s, "
"isNativelyFocal=%s, focalParams=half2(%f, %f))",
- (int)type, (isRadiusIncreasing ? "true" : "false"),
- (isFocalOnCircle ? "true" : "false"), (isWellBehaved ? "true" : "false"),
- (isSwapped ? "true" : "false"), (isNativelyFocal ? "true" : "false"), focalParams.fX,
+ (int)type,
+ (isRadiusIncreasing ? "true" : "false"),
+ (isFocalOnCircle ? "true" : "false"),
+ (isWellBehaved ? "true" : "false"),
+ (isSwapped ? "true" : "false"),
+ (isNativelyFocal ? "true" : "false"),
+ focalParams.fX,
focalParams.fY);
}
#endif
@@ -260,14 +280,23 @@
}
GrGradientShader::RandomParams params(d->fRandom);
- auto shader = params.fUseColors4f
- ? SkGradientShader::MakeTwoPointConical(
- center1, radius1, center2, radius2, params.fColors4f,
- params.fColorSpace, params.fStops, params.fColorCount,
- params.fTileMode)
- : SkGradientShader::MakeTwoPointConical(
- center1, radius1, center2, radius2, params.fColors,
- params.fStops, params.fColorCount, params.fTileMode);
+ auto shader = params.fUseColors4f ? SkGradientShader::MakeTwoPointConical(center1,
+ radius1,
+ center2,
+ radius2,
+ params.fColors4f,
+ params.fColorSpace,
+ params.fStops,
+ params.fColorCount,
+ params.fTileMode)
+ : SkGradientShader::MakeTwoPointConical(center1,
+ radius1,
+ center2,
+ radius2,
+ params.fColors,
+ params.fStops,
+ params.fColorCount,
+ params.fTileMode);
GrTest::TestAsFPArgs asFPArgs(d);
std::unique_ptr<GrFragmentProcessor> fp = as_SB(shader)->asFragmentProcessor(asFPArgs.args());
@@ -347,8 +376,13 @@
matrix.postConcat(grad.getGradientMatrix());
}
- return GrMatrixEffect::Make(
- matrix, std::unique_ptr<GrFragmentProcessor>(new GrTwoPointConicalGradientLayout(
- grType, isRadiusIncreasing, isFocalOnCircle, isWellBehaved, isSwapped,
- isNativelyFocal, focalParams)));
+ return GrMatrixEffect::Make(matrix,
+ std::unique_ptr<GrFragmentProcessor>(
+ new GrTwoPointConicalGradientLayout(grType,
+ isRadiusIncreasing,
+ isFocalOnCircle,
+ isWellBehaved,
+ isSwapped,
+ isNativelyFocal,
+ focalParams)));
}