Added GrGLFragmentProcessor::EmitArgs struct for use with emitCode()

Added GrGLFragmentProcessor::EmitArgs struct for use with emitCode()

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/7c157a988845fb00f9024d6db6dda142c3458033

[wangyix, 2015-07-22 16:04:08]

wangyix@google.com changed reviewers:
+ joshualitt@google.com

[wangyix, 2015-07-22 18:15:03]

The CQ bit was checked by wangyix@google.com

[wangyix, 2015-07-22 18:15:04]

The CQ bit was unchecked by wangyix@google.com

[joshualitt, 2015-07-22 19:34:06]

nits

https://codereview.chromium.org/1251173002/diff/1/samplecode/SampleLighting.cpp
File samplecode/SampleLighting.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/samplecode/SampleLighting.c...
samplecode/SampleLighting.cpp:158: fpb->appendTextureLookup(args.fSamplers[1],
args.fCoords[0].c_str(), args.fCoords[0].getType());
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkArithmeticMod...
File src/effects/SkArithmeticMode_gpu.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkArithmeticMod...
src/effects/SkArithmeticMode_gpu.cpp:66:
fsBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
args.fCoords[0].getType());
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkArithmeticMod...
src/effects/SkArithmeticMode_gpu.cpp:75: add_arithmetic_code(fsBuilder,
args.fInputColor, dstColor, args.fOutputColor, kUni, fEnforcePMColor);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkBlurMaskFilte...
File src/effects/SkBlurMaskFilter.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkBlurMaskFilte...
src/effects/SkBlurMaskFilter.cpp:728: OutputRectBlurProfileLookup(fsBuilder,
args.fSamplers[0], "horiz_lookup", profileSizeName, "translatedPos.x", "width",
"wh.x");
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkBlurMaskFilte...
src/effects/SkBlurMaskFilter.cpp:729: OutputRectBlurProfileLookup(fsBuilder,
args.fSamplers[0], "vert_lookup", profileSizeName, "translatedPos.y", "height",
"wh.y");
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkColorFilters.cpp
File src/effects/SkColorFilters.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkColorFilters....
src/effects/SkColorFilters.cpp:175: fFilterColorUni =
args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkColorMatrixFi...
File src/effects/SkColorMatrixFilter.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkColorMatrixFi...
src/effects/SkColorMatrixFilter.cpp:431: fsBuilder->codeAppendf("\tfloat
nonZeroAlpha = max(%s.a, 0.00001);\n", args.fInputColor);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkColorMatrixFi...
src/effects/SkColorMatrixFilter.cpp:437: fsBuilder->codeAppendf("\t%s =
clamp(%s, 0.0, 1.0);\n", args.fOutputColor, args.fOutputColor);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkDisplacementM...
File src/effects/SkDisplacementMapEffect.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkDisplacementM...
src/effects/SkDisplacementMapEffect.cpp:572:
fsBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
args.fCoords[0].getType());
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkDisplacementM...
src/effects/SkDisplacementMapEffect.cpp:619: fGLDomain.sampleTexture(fsBuilder,
domain, args.fOutputColor, SkString(cCoords), args.fSamplers[1]);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkMagnifierImag...
File src/effects/SkMagnifierImageFilter.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkMagnifierImag...
src/effects/SkMagnifierImageFilter.cpp:150:
args.fBuilder->getUniformCStr(fOffsetVar),
indent

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkMagnifierImag...
src/effects/SkMagnifierImageFilter.cpp:156: fsBuilder->codeAppendf("\t\tdelta =
delta * %s;\n", args.fBuilder->getUniformCStr(fInvInsetVar));
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkPerlinNoiseSh...
File src/effects/SkPerlinNoiseShader.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkPerlinNoiseSh...
src/effects/SkPerlinNoiseShader.cpp:725:
fsBuilder->appendTextureLookup(&noiseCode, args.fSamplers[0], xCoords.c_str(),
kVec2f_GrSLType);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkPerlinNoiseSh...
src/effects/SkPerlinNoiseShader.cpp:735:
fsBuilder->appendTextureLookup(&noiseCode, args.fSamplers[0], xCoords.c_str(),
kVec2f_GrSLType);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkPerlinNoiseSh...
src/effects/SkPerlinNoiseShader.cpp:875: fsBuilder->codeAppendf("\n\t\t%s = %s *
vec4(0.5) + vec4(0.5);", args.fOutputColor, args.fOutputColor);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkPerlinNoiseSh...
src/effects/SkPerlinNoiseShader.cpp:885: args.fOutputColor, args.fOutputColor,
args.fOutputColor, args.fOutputColor);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkTableColorFil...
File src/effects/SkTableColorFilter.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/SkTableColorFil...
src/effects/SkTableColorFilter.cpp:431: fsBuilder->codeAppendf("\t\tvec4 coord =
vec4(%s.rgb / nonZeroAlpha, nonZeroAlpha);\n", args.fInputColor);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkLin...
File src/effects/gradients/SkLinearGradient.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkLin...
src/effects/gradients/SkLinearGradient.cpp:553: this->emitColor(args.fBuilder,
ge, t.c_str(), args.fOutputColor, args.fInputColor, args.fSamplers);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkRad...
File src/effects/gradients/SkRadialGradient.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkRad...
src/effects/gradients/SkRadialGradient.cpp:528: this->emitColor(args.fBuilder,
ge, t.c_str(), args.fOutputColor, args.fInputColor, args.fSamplers);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkSwe...
File src/effects/gradients/SkSweepGradient.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkSwe...
src/effects/gradients/SkSweepGradient.cpp:267: SkString coords2D =
args.fBuilder->getFragmentShaderBuilder()->ensureFSCoords2D(args.fCoords, 0);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkSwe...
src/effects/gradients/SkSweepGradient.cpp:280: this->emitColor(args.fBuilder,
ge, t.c_str(), args.fOutputColor, args.fInputColor, args.fSamplers);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkTwo...
File src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkTwo...
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp:250:
args.fCoords[0].c_str(), args.fCoords[0].c_str(), args.fCoords[1].c_str(),
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkTwo...
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp:275:
this->emitColor(args.fBuilder, ge, tName.c_str(), args.fOutputColor,
args.fInputColor, args.fSamplers);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkTwo...
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp:548:
this->emitColor(args.fBuilder, ge, tName.c_str(), args.fOutputColor,
args.fInputColor, args.fSamplers);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkTwo...
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp:736:
this->emitColor(args.fBuilder, ge, tName.c_str(), args.fOutputColor,
args.fInputColor, args.fSamplers);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkTwo...
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp:1001:
this->emitColor(args.fBuilder, ge, tName.c_str(), args.fOutputColor,
args.fInputColor, args.fSamplers);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/effects/gradients/SkTwo...
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp:1250:
this->emitColor(args.fBuilder, ge, tName.c_str(), args.fOutputColor,
args.fInputColor, args.fSamplers);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrBicubicEf...
File src/gpu/effects/GrBicubicEffect.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrBicubicEf...
src/gpu/effects/GrBicubicEffect.cpp:103: fsBuilder->codeAppendf("\t%s = %s;\n",
args.fOutputColor, (GrGLSLExpr4(bicubicColor.c_str()) *
GrGLSLExpr4(args.fInputColor)).c_str());
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrConfigCon...
File src/gpu/effects/GrConfigConversionEffect.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrConfigCon...
src/gpu/effects/GrConfigConversionEffect.cpp:37:
fsBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
args.fCoords[0].getType());
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrConstColo...
File src/gpu/effects/GrConstColorProcessor.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrConstColo...
src/gpu/effects/GrConstColorProcessor.cpp:27: fsBuilder->codeAppendf("%s = %s *
%s;", args.fOutputColor, args.fInputColor, colorUni);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrConstColo...
src/gpu/effects/GrConstColorProcessor.cpp:30: fsBuilder->codeAppendf("%s = %s.a
* %s;", args.fOutputColor, args.fInputColor, colorUni);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrConvoluti...
File src/gpu/effects/GrConvolutionEffect.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrConvoluti...
src/gpu/effects/GrConvolutionEffect.cpp:101: fBoundsUni =
args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
kVec2f_GrSLType,
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrConvoluti...
src/gpu/effects/GrConvolutionEffect.cpp:104: fKernelUni =
args.fBuilder->addUniformArray(GrGLProgramBuilder::kFragment_Visibility,
kFloat_GrSLType,
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrCustomXfe...
File src/gpu/effects/GrCustomXfermode.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrCustomXfe...
src/gpu/effects/GrCustomXfermode.cpp:455:
fsBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
args.fCoords[0].getType());
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrTextureDo...
File src/gpu/effects/GrTextureDomain.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrTextureDo...
src/gpu/effects/GrTextureDomain.cpp:192: fGLDomain.sampleTexture(fsBuilder,
domain, args.fOutputColor, coords2D, args.fSamplers[0], args.fInputColor);
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrYUVtoRGBE...
File src/gpu/effects/GrYUVtoRGBEffect.cpp (right):

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrYUVtoRGBE...
src/gpu/effects/GrYUVtoRGBEffect.cpp:72:
fsBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
args.fCoords[0].getType());
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrYUVtoRGBE...
src/gpu/effects/GrYUVtoRGBEffect.cpp:74:
fsBuilder->appendTextureLookup(args.fSamplers[1], args.fCoords[1].c_str(),
args.fCoords[1].getType());
line wrap @100

https://codereview.chromium.org/1251173002/diff/1/src/gpu/effects/GrYUVtoRGBE...
src/gpu/effects/GrYUVtoRGBEffect.cpp:76:
fsBuilder->appendTextureLookup(args.fSamplers[2], args.fCoords[2].c_str(),
args.fCoords[2].getType());
line wrap @100

[wangyix, 2015-07-22 20:42:13]

Nits fixed.

[joshualitt, 2015-07-22 21:05:35]

On 2015/07/22 20:42:13, wangyix wrote:
> Nits fixed.

lgtm

[wangyix, 2015-07-22 22:00:14]

The CQ bit was checked by wangyix@google.com

[commit-bot: I haz the power, 2015-07-22 22:00:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1251173002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1251173002/40001

[commit-bot: I haz the power, 2015-07-22 22:08:58]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/7c157a988845fb00f9024d6db6dda142c3458033