Chromium Code Reviews| Index: src/effects/SkColorFilters.cpp |
| diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp |
| index 92fe4d708ec9a98ce28a6fa9710f5925bc087216..6601a2d13230a44da8e535fd260b118de5faf0df 100644 |
| --- a/src/effects/SkColorFilters.cpp |
| +++ b/src/effects/SkColorFilters.cpp |
| @@ -166,18 +166,13 @@ public: |
| GLProcessor(const GrProcessor&) { |
| } |
| - virtual void emitCode(GrGLFPBuilder* builder, |
| - const GrFragmentProcessor& fp, |
| - const char* outputColor, |
| - const char* inputColor, |
| - const TransformedCoordsArray&, |
| - const TextureSamplerArray&) override { |
| - SkXfermode::Mode mode = fp.cast<ModeColorFilterEffect>().mode(); |
| + virtual void emitCode(EmitArgs& args) override { |
| + SkXfermode::Mode mode = args.fFp.cast<ModeColorFilterEffect>().mode(); |
| SkASSERT(SkXfermode::kDst_Mode != mode); |
| const char* colorFilterColorUniName = NULL; |
| - if (fp.cast<ModeColorFilterEffect>().willUseFilterColor()) { |
| - fFilterColorUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, |
| + if (args.fFp.cast<ModeColorFilterEffect>().willUseFilterColor()) { |
| + fFilterColorUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, |
|
joshualitt
2015/07/22 19:34:04
line wrap @100
|
| kVec4f_GrSLType, kDefault_GrSLPrecision, |
| "FilterColor", |
| &colorFilterColorUniName); |
| @@ -185,10 +180,10 @@ public: |
| GrGLSLExpr4 filter = |
| color_filter_expression(mode, GrGLSLExpr4(colorFilterColorUniName), |
| - GrGLSLExpr4(inputColor)); |
| + GrGLSLExpr4(args.fInputColor)); |
| - builder->getFragmentShaderBuilder()-> |
| - codeAppendf("\t%s = %s;\n", outputColor, filter.c_str()); |
| + args.fBuilder->getFragmentShaderBuilder()-> |
| + codeAppendf("\t%s = %s;\n", args.fOutputColor, filter.c_str()); |
| } |
| static void GenKey(const GrProcessor& fp, const GrGLSLCaps&, |