| Index: src/effects/gradients/SkLinearGradient.cpp
|
| diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
|
| index 4f85da39d378b260bfd883fa0749e9a6f53599c5..f1b1d5380276c0ec16a114b8152ee36f48920b4d 100644
|
| --- a/src/effects/gradients/SkLinearGradient.cpp
|
| +++ b/src/effects/gradients/SkLinearGradient.cpp
|
| @@ -446,7 +446,7 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y,
|
| #if SK_SUPPORT_GPU
|
|
|
| #include "GrTBackendEffectFactory.h"
|
| -#include "gl/GrGLShaderBuilder.h"
|
| +#include "gl/builders/GrGLProgramBuilder.h"
|
| #include "SkGr.h"
|
|
|
| /////////////////////////////////////////////////////////////////////
|
| @@ -459,7 +459,7 @@ public:
|
|
|
| virtual ~GrGLLinearGradient() { }
|
|
|
| - virtual void emitCode(GrGLShaderBuilder*,
|
| + virtual void emitCode(GrGLProgramBuilder*,
|
| const GrDrawEffect&,
|
| const GrEffectKey&,
|
| const char* outputColor,
|
| @@ -536,7 +536,7 @@ GrEffect* GrLinearGradient::TestCreate(SkRandom* random,
|
|
|
| /////////////////////////////////////////////////////////////////////
|
|
|
| -void GrGLLinearGradient::emitCode(GrGLShaderBuilder* builder,
|
| +void GrGLLinearGradient::emitCode(GrGLProgramBuilder* builder,
|
| const GrDrawEffect&,
|
| const GrEffectKey& key,
|
| const char* outputColor,
|
| @@ -545,7 +545,7 @@ void GrGLLinearGradient::emitCode(GrGLShaderBuilder* builder,
|
| const TextureSamplerArray& samplers) {
|
| uint32_t baseKey = key.get32(0);
|
| this->emitUniforms(builder, baseKey);
|
| - SkString t = builder->ensureFSCoords2D(coords, 0);
|
| + SkString t = builder->getFragmentShaderBuilder()->ensureFSCoords2D(coords, 0);
|
| t.append(".x");
|
| this->emitColor(builder, t.c_str(), baseKey, outputColor, inputColor, samplers);
|
| }
|
|
|