diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-30 19:11:34 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-30 19:11:34 +0000 |
| commit | 868a8e7fc83e9ac6ee1418e75b84a0595605626c (patch) | |
| tree | 6099dee09e40beed726e2f6d300485935b73cbb2 /src/gpu/effects/GrConvolutionEffect.cpp | |
| parent | 7426743837051f43dbc1209775b391b917c69c54 (diff) | |
Recommit r5350 with fix for image failures (which affected GLs that don't support ARB_texture_swizzle).
git-svn-id: http://skia.googlecode.com/svn/trunk@5353 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects/GrConvolutionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 162a0cc4c8..635064fef7 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -84,15 +84,11 @@ void GrGLConvolutionEffect::emitFS(GrGLShaderBuilder* builder, index.appendS32(i); kernel.appendArrayAccess(index.c_str(), &kernelIndex); code->appendf("\t\t%s += ", outputColor); - builder->emitTextureLookup(samplerName, "coord"); + builder->appendTextureLookup(&builder->fFSCode, samplerName, "coord"); code->appendf(" * %s;\n", kernelIndex.c_str()); code->appendf("\t\tcoord += %s;\n", imgInc); } - - if (builder->fModulate.size()) { - code->appendf("\t\t%s = %s%s;\n", outputColor, outputColor, - builder->fModulate.c_str()); - } + GrGLSLMulVarBy4f(&builder->fFSCode, 2, outputColor, inputColor); } void GrGLConvolutionEffect::setData(const GrGLUniformManager& uman, |