Index: src/gpu/effects/GrDashingEffect.cpp |
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp |
index b724082800dd3bdc1824ad134b15581cc49e24b5..3fa3014a9d5d88ee2915cf6de07ba059df9d1a9c 100644 |
--- a/src/gpu/effects/GrDashingEffect.cpp |
+++ b/src/gpu/effects/GrDashingEffect.cpp |
@@ -23,8 +23,10 @@ |
#include "batches/GrVertexBatch.h" |
#include "gl/GrGLGeometryProcessor.h" |
#include "gl/GrGLFragmentProcessor.h" |
-#include "gl/builders/GrGLProgramBuilder.h" |
+#include "glsl/GrGLSLFragmentShaderBuilder.h" |
+#include "glsl/GrGLSLProgramBuilder.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
+#include "glsl/GrGLSLVertexShaderBuilder.h" |
/////////////////////////////////////////////////////////////////////////////// |
@@ -851,7 +853,7 @@ GLDashingCircleEffect::GLDashingCircleEffect() { |
void GLDashingCircleEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { |
const DashingCircleEffect& dce = args.fGP.cast<DashingCircleEffect>(); |
GrGLSLGPBuilder* pb = args.fPB; |
- GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); |
+ GrGLSLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); |
// emit attributes |
vsBuilder->emitAttributes(dce); |
@@ -879,7 +881,7 @@ void GLDashingCircleEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { |
args.fTransformsIn, args.fTransformsOut); |
// transforms all points so that we can compare them to our test circle |
- GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); |
+ GrGLSLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); |
fsBuilder->codeAppendf("float xShifted = %s.x - floor(%s.x / %s.z) * %s.z;", |
dashParams.fsIn(), dashParams.fsIn(), dashParams.fsIn(), |
dashParams.fsIn()); |
@@ -1056,7 +1058,7 @@ void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { |
const DashingLineEffect& de = args.fGP.cast<DashingLineEffect>(); |
GrGLSLGPBuilder* pb = args.fPB; |
- GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); |
+ GrGLSLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); |
// emit attributes |
vsBuilder->emitAttributes(de); |
@@ -1086,7 +1088,7 @@ void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { |
args.fTransformsIn, args.fTransformsOut); |
// transforms all points so that we can compare them to our test rect |
- GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); |
+ GrGLSLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); |
fsBuilder->codeAppendf("float xShifted = %s.x - floor(%s.x / %s.z) * %s.z;", |
inDashParams.fsIn(), inDashParams.fsIn(), inDashParams.fsIn(), |
inDashParams.fsIn()); |