Index: src/effects/SkPerlinNoiseShader.cpp |
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp |
index 0c455693c3a3f3b5a8385544de2c06f5171667fc..045f3beff2845ec55fa9fd0c47d4d1fc590d9cac 100644 |
--- a/src/effects/SkPerlinNoiseShader.cpp |
+++ b/src/effects/SkPerlinNoiseShader.cpp |
@@ -21,7 +21,8 @@ |
#include "SkGr.h" |
#include "effects/GrConstColorProcessor.h" |
#include "gl/GrGLFragmentProcessor.h" |
-#include "gl/builders/GrGLProgramBuilder.h" |
+#include "glsl/GrGLSLFragmentShaderBuilder.h" |
+#include "glsl/GrGLSLProgramBuilder.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
#endif |
@@ -620,17 +621,17 @@ GrGLPerlinNoise::GrGLPerlinNoise(const GrProcessor& processor) |
} |
void GrGLPerlinNoise::emitCode(EmitArgs& args) { |
- GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
+ GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
SkString vCoords = fsBuilder->ensureFSCoords2D(args.fCoords, 0); |
- fBaseFrequencyUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, |
+ fBaseFrequencyUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, |
kVec2f_GrSLType, kDefault_GrSLPrecision, |
"baseFrequency"); |
const char* baseFrequencyUni = args.fBuilder->getUniformCStr(fBaseFrequencyUni); |
const char* stitchDataUni = nullptr; |
if (fStitchTiles) { |
- fStitchDataUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility, |
+ fStitchDataUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, |
kVec2f_GrSLType, kDefault_GrSLPrecision, |
"stitchData"); |
stitchDataUni = args.fBuilder->getUniformCStr(fStitchDataUni); |