Index: src/gpu/effects/GrConvexPolyEffect.cpp |
diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp |
index 13df7bc4bd6fbf14cac1d4cb6e9ac90926bc65b1..dc7a5285013eeaf1b0234e30c98147e00d77411a 100644 |
--- a/src/gpu/effects/GrConvexPolyEffect.cpp |
+++ b/src/gpu/effects/GrConvexPolyEffect.cpp |
@@ -10,8 +10,8 @@ |
#include "SkPathPriv.h" |
#include "glsl/GrGLSLFragmentProcessor.h" |
#include "glsl/GrGLSLFragmentShaderBuilder.h" |
-#include "glsl/GrGLSLProgramBuilder.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
+#include "glsl/GrGLSLUniformHandler.h" |
////////////////////////////////////////////////////////////////////////////// |
class AARectEffect : public GrFragmentProcessor { |
@@ -105,11 +105,11 @@ void GLAARectEffect::emitCode(EmitArgs& args) { |
const char *rectName; |
// The rect uniform's xyzw refer to (left + 0.5, top + 0.5, right - 0.5, bottom - 0.5), |
// respectively. |
- fRectUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, |
- kVec4f_GrSLType, |
- kDefault_GrSLPrecision, |
- "rect", |
- &rectName); |
+ fRectUniform = args.fUniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, |
+ kVec4f_GrSLType, |
+ kDefault_GrSLPrecision, |
+ "rect", |
+ &rectName); |
GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder; |
const char* fragmentPos = fragBuilder->fragmentPosition(); |
@@ -191,12 +191,12 @@ void GrGLConvexPolyEffect::emitCode(EmitArgs& args) { |
const GrConvexPolyEffect& cpe = args.fFp.cast<GrConvexPolyEffect>(); |
const char *edgeArrayName; |
- fEdgeUniform = args.fBuilder->addUniformArray(GrGLSLProgramBuilder::kFragment_Visibility, |
- kVec3f_GrSLType, |
- kDefault_GrSLPrecision, |
- "edges", |
- cpe.getEdgeCount(), |
- &edgeArrayName); |
+ fEdgeUniform = args.fUniformHandler->addUniformArray(GrGLSLUniformHandler::kFragment_Visibility, |
+ kVec3f_GrSLType, |
+ kDefault_GrSLPrecision, |
+ "edges", |
+ cpe.getEdgeCount(), |
+ &edgeArrayName); |
GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder; |
fragBuilder->codeAppend("\t\tfloat alpha = 1.0;\n"); |
fragBuilder->codeAppend("\t\tfloat edge;\n"); |