| Index: src/effects/gradients/SkLinearGradient.cpp
|
| diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
|
| index b22447453679a63ee0025cd961a1b44da152f9c4..9f7418f7eaa27c4e56de0753558b1b37e2ea4f16 100644
|
| --- a/src/effects/gradients/SkLinearGradient.cpp
|
| +++ b/src/effects/gradients/SkLinearGradient.cpp
|
| @@ -515,7 +515,8 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y,
|
|
|
| #if SK_SUPPORT_GPU
|
|
|
| -#include "gl/builders/GrGLProgramBuilder.h"
|
| +#include "glsl/GrGLSLCaps.h"
|
| +#include "glsl/GrGLSLFragmentShaderBuilder.h"
|
| #include "SkGr.h"
|
|
|
| /////////////////////////////////////////////////////////////////////
|
| @@ -603,11 +604,11 @@ const GrFragmentProcessor* GrLinearGradient::TestCreate(GrProcessorTestData* d)
|
|
|
| void GrGLLinearGradient::emitCode(EmitArgs& args) {
|
| const GrLinearGradient& ge = args.fFp.cast<GrLinearGradient>();
|
| - this->emitUniforms(args.fBuilder, ge);
|
| + this->emitUniforms(args.fUniformHandler, ge);
|
| SkString t = args.fFragBuilder->ensureFSCoords2D(args.fCoords, 0);
|
| t.append(".x");
|
| - this->emitColor(args.fBuilder,
|
| - args.fFragBuilder,
|
| + this->emitColor(args.fFragBuilder,
|
| + args.fUniformHandler,
|
| args.fGLSLCaps,
|
| ge, t.c_str(),
|
| args.fOutputColor,
|
|
|