| Index: src/gpu/gl/GrGLProgramEffects.cpp
|
| diff --git a/src/gpu/gl/GrGLProgramEffects.cpp b/src/gpu/gl/GrGLProgramEffects.cpp
|
| index 17c666a015b87369c631ec65f027dcc33b66baa0..9ab55c3f4e170adf4a7f7545ba8035608c5afcc1 100644
|
| --- a/src/gpu/gl/GrGLProgramEffects.cpp
|
| +++ b/src/gpu/gl/GrGLProgramEffects.cpp
|
| @@ -263,7 +263,7 @@ void GrGLVertexProgramEffects::emitEffect(GrGLFullShaderBuilder* builder,
|
| const GrEffectStage& stage,
|
| EffectKey key,
|
| const char* outColor,
|
| - const char* inColor,
|
| + const GrGLSLExpr4& inColor,
|
| int stageIndex) {
|
| GrDrawEffect drawEffect(stage, fHasExplicitLocalCoords);
|
| const GrEffectRef& effect = *stage.getEffect();
|
| @@ -461,7 +461,7 @@ GrGLVertexProgramEffectsBuilder::GrGLVertexProgramEffectsBuilder(GrGLFullShaderB
|
| void GrGLVertexProgramEffectsBuilder::emitEffect(const GrEffectStage& stage,
|
| GrGLProgramEffects::EffectKey key,
|
| const char* outColor,
|
| - const char* inColor,
|
| + const GrGLSLExpr4& inColor,
|
| int stageIndex) {
|
| SkASSERT(NULL != fProgramEffects.get());
|
| fProgramEffects->emitEffect(fBuilder, stage, key, outColor, inColor, stageIndex);
|
| @@ -473,7 +473,7 @@ void GrGLTexGenProgramEffects::emitEffect(GrGLFragmentOnlyShaderBuilder* builder
|
| const GrEffectStage& stage,
|
| EffectKey key,
|
| const char* outColor,
|
| - const char* inColor,
|
| + const GrGLSLExpr4& inColor,
|
| int stageIndex) {
|
| GrDrawEffect drawEffect(stage, false);
|
| const GrEffectRef& effect = *stage.getEffect();
|
| @@ -579,7 +579,7 @@ GrGLTexGenProgramEffectsBuilder::GrGLTexGenProgramEffectsBuilder(
|
| void GrGLTexGenProgramEffectsBuilder::emitEffect(const GrEffectStage& stage,
|
| GrGLProgramEffects::EffectKey key,
|
| const char* outColor,
|
| - const char* inColor,
|
| + const GrGLSLExpr4& inColor,
|
| int stageIndex) {
|
| SkASSERT(NULL != fProgramEffects.get());
|
| fProgramEffects->emitEffect(fBuilder, stage, key, outColor, inColor, stageIndex);
|
|
|