Index: src/effects/SkMagnifierImageFilter.cpp |
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp |
index c7d3d5ae2d1a48ceefa471ca09fb22498ea54ca6..2d90c4478139d27dbc0192633c7a5c3d33f6f764 100644 |
--- a/src/effects/SkMagnifierImageFilter.cpp |
+++ b/src/effects/SkMagnifierImageFilter.cpp |
@@ -19,7 +19,8 @@ |
#include "effects/GrSingleTextureEffect.h" |
#include "gl/GrGLFragmentProcessor.h" |
#include "gl/GrGLTexture.h" |
-#include "gl/builders/GrGLProgramBuilder.h" |
+#include "glsl/GrGLSLFragmentShaderBuilder.h" |
+#include "glsl/GrGLSLProgramBuilder.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
class GrMagnifierEffect : public GrSingleTextureEffect { |
@@ -121,23 +122,19 @@ GrGLMagnifierEffect::GrGLMagnifierEffect(const GrProcessor&) { |
void GrGLMagnifierEffect::emitCode(EmitArgs& args) { |
fOffsetVar = args.fBuilder->addUniform( |
- GrGLProgramBuilder::kFragment_Visibility | |
- GrGLProgramBuilder::kVertex_Visibility, |
+ GrGLSLProgramBuilder::kFragment_Visibility, |
kVec2f_GrSLType, kDefault_GrSLPrecision, "Offset"); |
fInvZoomVar = args.fBuilder->addUniform( |
- GrGLProgramBuilder::kFragment_Visibility | |
- GrGLProgramBuilder::kVertex_Visibility, |
+ GrGLSLProgramBuilder::kFragment_Visibility, |
kVec2f_GrSLType, kDefault_GrSLPrecision, "InvZoom"); |
fInvInsetVar = args.fBuilder->addUniform( |
- GrGLProgramBuilder::kFragment_Visibility | |
- GrGLProgramBuilder::kVertex_Visibility, |
+ GrGLSLProgramBuilder::kFragment_Visibility, |
kVec2f_GrSLType, kDefault_GrSLPrecision, "InvInset"); |
fBoundsVar = args.fBuilder->addUniform( |
- GrGLProgramBuilder::kFragment_Visibility | |
- GrGLProgramBuilder::kVertex_Visibility, |
+ GrGLSLProgramBuilder::kFragment_Visibility, |
kVec4f_GrSLType, kDefault_GrSLPrecision, "Bounds"); |
- GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
+ GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
SkString coords2D = fsBuilder->ensureFSCoords2D(args.fCoords, 0); |
fsBuilder->codeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str()); |
fsBuilder->codeAppendf("\t\tvec2 zoom_coord = %s + %s * %s;\n", |