| Index: src/effects/SkTableColorFilter.cpp
|
| diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
|
| index 7b997001e442fb986e8e4e4ef8e6b6fce16e0e41..872fdfddc231891325ee7990f76bbb942bf3946e 100644
|
| --- a/src/effects/SkTableColorFilter.cpp
|
| +++ b/src/effects/SkTableColorFilter.cpp
|
| @@ -336,7 +336,8 @@ SkColorFilter* SkTable_ColorFilter::newComposed(const SkColorFilter* innerFilter
|
| #include "SkGr.h"
|
| #include "effects/GrTextureStripAtlas.h"
|
| #include "gl/GrGLFragmentProcessor.h"
|
| -#include "gl/builders/GrGLProgramBuilder.h"
|
| +#include "glsl/GrGLSLFragmentShaderBuilder.h"
|
| +#include "glsl/GrGLSLProgramBuilder.h"
|
| #include "glsl/GrGLSLProgramDataManager.h"
|
|
|
| class ColorTableEffect : public GrFragmentProcessor {
|
| @@ -419,7 +420,7 @@ void GLColorTableEffect::emitCode(EmitArgs& args) {
|
| "yoffsets", &yoffsets);
|
| static const float kColorScaleFactor = 255.0f / 256.0f;
|
| static const float kColorOffsetFactor = 1.0f / 512.0f;
|
| - GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder();
|
| + GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder();
|
| if (nullptr == args.fInputColor) {
|
| // the input color is solid white (all ones).
|
| static const float kMaxValue = kColorScaleFactor + kColorOffsetFactor;
|
| @@ -501,7 +502,7 @@ ColorTableEffect::~ColorTableEffect() {
|
| }
|
|
|
| void ColorTableEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const {
|
| + GrProcessorKeyBuilder* b) const {
|
| GLColorTableEffect::GenKey(*this, caps, b);
|
| }
|
|
|
|
|