| Index: src/gpu/effects/GrConstColorProcessor.cpp
|
| diff --git a/src/gpu/effects/GrConstColorProcessor.cpp b/src/gpu/effects/GrConstColorProcessor.cpp
|
| index cf567aac5c4f08d91b07131e297a61913a4d3705..03b0fa405426bd51ab22ecd14612900cf1de5d60 100644
|
| --- a/src/gpu/effects/GrConstColorProcessor.cpp
|
| +++ b/src/gpu/effects/GrConstColorProcessor.cpp
|
| @@ -6,10 +6,11 @@
|
| */
|
|
|
| #include "effects/GrConstColorProcessor.h"
|
| +#include "GrInvariantOutput.h"
|
| #include "glsl/GrGLSLFragmentProcessor.h"
|
| #include "glsl/GrGLSLFragmentShaderBuilder.h"
|
| -#include "glsl/GrGLSLProgramBuilder.h"
|
| #include "glsl/GrGLSLProgramDataManager.h"
|
| +#include "glsl/GrGLSLUniformHandler.h"
|
|
|
| class GLConstColorProcessor : public GrGLSLFragmentProcessor {
|
| public:
|
| @@ -18,9 +19,10 @@ public:
|
| void emitCode(EmitArgs& args) override {
|
| GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
|
| const char* colorUni;
|
| - fColorUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
|
| - kVec4f_GrSLType, kMedium_GrSLPrecision, "constantColor",
|
| - &colorUni);
|
| + fColorUniform = args.fUniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility,
|
| + kVec4f_GrSLType, kMedium_GrSLPrecision,
|
| + "constantColor",
|
| + &colorUni);
|
| GrConstColorProcessor::InputMode mode = args.fFp.cast<GrConstColorProcessor>().inputMode();
|
| if (!args.fInputColor) {
|
| mode = GrConstColorProcessor::kIgnore_InputMode;
|
|
|