| Index: src/effects/SkArithmeticMode.cpp
|
| diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp
|
| index 1efa11510609dbd802aaa53158411672f58f09ee..fd81d8246a0364bf287ec162f2499cfc782d79d1 100644
|
| --- a/src/effects/SkArithmeticMode.cpp
|
| +++ b/src/effects/SkArithmeticMode.cpp
|
| @@ -354,10 +354,7 @@ void GrGLArithmeticEffect::emitCode(GrGLShaderBuilder* builder,
|
| SkString bgCoords;
|
| GrSLType bgCoordsType = fBackgroundEffectMatrix.emitCode(builder, key, &bgCoords, NULL, "BG");
|
| builder->fsCodeAppend("\t\tvec4 bgColor = ");
|
| - builder->appendTextureLookup(GrGLShaderBuilder::kFragment_ShaderType,
|
| - samplers[0],
|
| - bgCoords.c_str(),
|
| - bgCoordsType);
|
| + builder->fsAppendTextureLookup(samplers[0], bgCoords.c_str(), bgCoordsType);
|
| builder->fsCodeAppendf(";\n");
|
| dstColor = "bgColor";
|
| } else {
|
| @@ -365,7 +362,7 @@ void GrGLArithmeticEffect::emitCode(GrGLShaderBuilder* builder,
|
| }
|
|
|
| SkASSERT(NULL != dstColor);
|
| - fKUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
|
| + fKUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
|
| kVec4f_GrSLType, "k");
|
| const char* kUni = builder->getUniformCStr(fKUni);
|
|
|
|
|