| Index: src/gpu/glsl/GrGLSLFragmentProcessor.h
|
| diff --git a/src/gpu/glsl/GrGLSLFragmentProcessor.h b/src/gpu/glsl/GrGLSLFragmentProcessor.h
|
| index 0fd1ae3c32f757b45d814f41c7d7e7a14d03148b..ca72a9c415b3df4d6fe1fb0bdba1989dd0e36ab3 100644
|
| --- a/src/gpu/glsl/GrGLSLFragmentProcessor.h
|
| +++ b/src/gpu/glsl/GrGLSLFragmentProcessor.h
|
| @@ -14,9 +14,10 @@
|
|
|
| class GrProcessor;
|
| class GrProcessorKeyBuilder;
|
| +class GrGLSLCaps;
|
| class GrGLSLFPBuilder;
|
| class GrGLSLFragmentBuilder;
|
| -class GrGLSLCaps;
|
| +class GrGLSLUniformHandler;
|
|
|
| class GrGLSLFragmentProcessor {
|
| public:
|
| @@ -51,24 +52,24 @@ public:
|
| */
|
|
|
| struct EmitArgs {
|
| - EmitArgs(GrGLSLFPBuilder* builder,
|
| - GrGLSLFragmentBuilder* fragBuilder,
|
| + EmitArgs(GrGLSLFragmentBuilder* fragBuilder,
|
| + GrGLSLUniformHandler* uniformHandler,
|
| const GrGLSLCaps* caps,
|
| const GrFragmentProcessor& fp,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const GrGLSLTransformedCoordsArray& coords,
|
| const TextureSamplerArray& samplers)
|
| - : fBuilder(builder)
|
| - , fFragBuilder(fragBuilder)
|
| + : fFragBuilder(fragBuilder)
|
| + , fUniformHandler(uniformHandler)
|
| , fGLSLCaps(caps)
|
| , fFp(fp)
|
| , fOutputColor(outputColor)
|
| , fInputColor(inputColor)
|
| , fCoords(coords)
|
| , fSamplers(samplers) {}
|
| - GrGLSLFPBuilder* fBuilder;
|
| GrGLSLFragmentBuilder* fFragBuilder;
|
| + GrGLSLUniformHandler* fUniformHandler;
|
| const GrGLSLCaps* fGLSLCaps;
|
| const GrFragmentProcessor& fFp;
|
| const char* fOutputColor;
|
|
|