| Index: src/gpu/effects/GrConvolutionEffect.cpp
|
| diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
|
| index d3d18409ea943c8452064e3ca767306b5e3ae58b..dd25d40e789087c7306435edae9a7e61687bef57 100644
|
| --- a/src/gpu/effects/GrConvolutionEffect.cpp
|
| +++ b/src/gpu/effects/GrConvolutionEffect.cpp
|
| @@ -64,13 +64,13 @@ void GrGLConvolutionEffect::emitCode(GrGLShaderBuilder* builder,
|
| const TextureSamplerArray& samplers) {
|
| SkString coords;
|
| fEffectMatrix.emitCodeMakeFSCoords2D(builder, key, &coords);
|
| - fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
|
| + fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
|
| kVec2f_GrSLType, "ImageIncrement");
|
| if (this->useBounds()) {
|
| - fBoundsUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
|
| + fBoundsUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
|
| kVec2f_GrSLType, "Bounds");
|
| }
|
| - fKernelUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_ShaderType,
|
| + fKernelUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility,
|
| kFloat_GrSLType, "Kernel", this->width());
|
|
|
| builder->fsCodeAppendf("\t\t%s = vec4(0, 0, 0, 0);\n", outputColor);
|
| @@ -88,7 +88,7 @@ void GrGLConvolutionEffect::emitCode(GrGLShaderBuilder* builder,
|
| index.appendS32(i);
|
| kernel.appendArrayAccess(index.c_str(), &kernelIndex);
|
| builder->fsCodeAppendf("\t\t%s += ", outputColor);
|
| - builder->appendTextureLookup(GrGLShaderBuilder::kFragment_ShaderType, samplers[0], "coord");
|
| + builder->fsAppendTextureLookup(samplers[0], "coord");
|
| if (this->useBounds()) {
|
| const char* bounds = builder->getUniformCStr(fBoundsUni);
|
| const char* component = this->direction() == Gr1DKernelEffect::kY_Direction ? "y" : "x";
|
|
|