| Index: src/effects/SkAlphaThresholdFilter.cpp
|
| diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
|
| index 495c62f3a44a0923e569c7db5d206a564f83eaef..167489b68974ca4dd703d773d28b7f9b0d885217 100644
|
| --- a/src/effects/SkAlphaThresholdFilter.cpp
|
| +++ b/src/effects/SkAlphaThresholdFilter.cpp
|
| @@ -58,7 +58,8 @@ SkImageFilter* SkAlphaThresholdFilter::Create(const SkRegion& region,
|
| #include "SkGr.h"
|
|
|
| #include "gl/GrGLFragmentProcessor.h"
|
| -#include "gl/builders/GrGLProgramBuilder.h"
|
| +#include "glsl/GrGLSLFragmentShaderBuilder.h"
|
| +#include "glsl/GrGLSLProgramBuilder.h"
|
| #include "glsl/GrGLSLProgramDataManager.h"
|
|
|
| class AlphaThresholdEffect : public GrFragmentProcessor {
|
| @@ -138,16 +139,14 @@ private:
|
| };
|
|
|
| void GrGLAlphaThresholdEffect::emitCode(EmitArgs& args) {
|
| - fInnerThresholdVar = args.fBuilder->addUniform(
|
| - GrGLProgramBuilder::kFragment_Visibility,
|
| - kFloat_GrSLType, kDefault_GrSLPrecision,
|
| - "inner_threshold");
|
| - fOuterThresholdVar = args.fBuilder->addUniform(
|
| - GrGLProgramBuilder::kFragment_Visibility,
|
| - kFloat_GrSLType, kDefault_GrSLPrecision,
|
| - "outer_threshold");
|
| -
|
| - GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder();
|
| + fInnerThresholdVar = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
|
| + kFloat_GrSLType, kDefault_GrSLPrecision,
|
| + "inner_threshold");
|
| + fOuterThresholdVar = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
|
| + kFloat_GrSLType, kDefault_GrSLPrecision,
|
| + "outer_threshold");
|
| +
|
| + GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder();
|
| SkString coords2D = fsBuilder->ensureFSCoords2D(args.fCoords, 0);
|
| SkString maskCoords2D = fsBuilder->ensureFSCoords2D(args.fCoords, 1);
|
|
|
| @@ -205,7 +204,7 @@ const GrFragmentProcessor* AlphaThresholdEffect::TestCreate(GrProcessorTestData*
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| void AlphaThresholdEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const {
|
| + GrProcessorKeyBuilder* b) const {
|
| GrGLAlphaThresholdEffect::GenKey(*this, caps, b);
|
| }
|
|
|
|
|