| Index: src/gpu/gl/GrGLVertexEffect.h
|
| diff --git a/src/gpu/gl/GrGLVertexEffect.h b/src/gpu/gl/GrGLVertexEffect.h
|
| index eba1fbe79573913a9b17cfab291ae05b571a2da9..2e82fbc4d7d85b86ee4b5a40ffd81c39a4fc2dbc 100644
|
| --- a/src/gpu/gl/GrGLVertexEffect.h
|
| +++ b/src/gpu/gl/GrGLVertexEffect.h
|
| @@ -24,27 +24,27 @@ public:
|
| * This is similar to emitCode() in the base class, except it takes a full shader builder.
|
| * This allows the effect subclass to emit vertex code.
|
| */
|
| - virtual void emitCode(GrGLFullShaderBuilder* builder,
|
| + virtual void emitCode(GrGLFullProgramBuilder* builder,
|
| const GrDrawEffect& drawEffect,
|
| const GrEffectKey& key,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray& coords,
|
| const TextureSamplerArray& samplers) = 0;
|
| -
|
| /**
|
| * Provide a default override for base class's emitCode() function.
|
| */
|
| - virtual void emitCode(GrGLShaderBuilder* builder,
|
| + virtual void emitCode(GrGLProgramBuilder* builder,
|
| const GrDrawEffect& drawEffect,
|
| const GrEffectKey& key,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray& coords,
|
| const TextureSamplerArray& samplers) SK_OVERRIDE {
|
| - SkFAIL("GrGLVertexEffect requires GrGLFullShaderBuilder* overload for emitCode().");
|
| + SkFAIL("GrGLVertexEffect requires GrGLFullProgramBuilder* overload for emitCode().");
|
| }
|
|
|
| +
|
| private:
|
| typedef GrGLEffect INHERITED;
|
| };
|
|
|