Index: src/effects/SkMorphologyImageFilter.cpp |
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp |
index 94210872c3a06781a6c64329058a17f671c98cbd..1d465edcb5246d9a144bcce9b57cfdfe326128a3 100644 |
--- a/src/effects/SkMorphologyImageFilter.cpp |
+++ b/src/effects/SkMorphologyImageFilter.cpp |
@@ -20,7 +20,8 @@ |
#include "GrTexture.h" |
#include "effects/Gr1DKernelEffect.h" |
#include "gl/GrGLFragmentProcessor.h" |
-#include "gl/builders/GrGLProgramBuilder.h" |
+#include "glsl/GrGLSLFragmentShaderBuilder.h" |
+#include "glsl/GrGLSLProgramBuilder.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
#endif |
@@ -287,16 +288,16 @@ GrGLMorphologyEffect::GrGLMorphologyEffect(const GrProcessor& proc) { |
} |
void GrGLMorphologyEffect::emitCode(EmitArgs& args) { |
- fPixelSizeUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, |
+ fPixelSizeUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, |
kFloat_GrSLType, kDefault_GrSLPrecision, |
"PixelSize"); |
const char* pixelSizeInc = args.fBuilder->getUniformCStr(fPixelSizeUni); |
- fRangeUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, |
+ fRangeUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, |
kVec2f_GrSLType, kDefault_GrSLPrecision, |
"Range"); |
const char* range = args.fBuilder->getUniformCStr(fRangeUni); |
- GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
+ GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
SkString coords2D = fsBuilder->ensureFSCoords2D(args.fCoords, 0); |
const char* func; |
switch (fType) { |