Index: src/gpu/effects/GrBicubicEffect.cpp |
diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp |
index a6ed1909d7cab8609e1cae752290ec71aebe1015..2857641edcfb708be45ccfdfcaad05277ca5db56 100644 |
--- a/src/gpu/effects/GrBicubicEffect.cpp |
+++ b/src/gpu/effects/GrBicubicEffect.cpp |
@@ -7,7 +7,8 @@ |
#include "GrBicubicEffect.h" |
#include "GrInvariantOutput.h" |
-#include "gl/builders/GrGLProgramBuilder.h" |
+#include "glsl/GrGLSLFragmentShaderBuilder.h" |
+#include "glsl/GrGLSLProgramBuilder.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
#define DS(x) SkDoubleToScalar(x) |
@@ -51,10 +52,10 @@ GrGLBicubicEffect::GrGLBicubicEffect(const GrProcessor&) { |
void GrGLBicubicEffect::emitCode(EmitArgs& args) { |
const GrTextureDomain& domain = args.fFp.cast<GrBicubicEffect>().domain(); |
- fCoefficientsUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, |
+ fCoefficientsUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, |
kMat44f_GrSLType, kDefault_GrSLPrecision, |
"Coefficients"); |
- fImageIncrementUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, |
+ fImageIncrementUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, |
kVec2f_GrSLType, kDefault_GrSLPrecision, |
"ImageIncrement"); |
@@ -71,7 +72,7 @@ void GrGLBicubicEffect::emitCode(EmitArgs& args) { |
GrGLSLShaderVar("c2", kVec4f_GrSLType), |
GrGLSLShaderVar("c3", kVec4f_GrSLType), |
}; |
- GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
+ GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
SkString coords2D = fsBuilder->ensureFSCoords2D(args.fCoords, 0); |
fsBuilder->emitFunction(kVec4f_GrSLType, |
"cubicBlend", |