aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/effects/GrColorTableEffect.cpp
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-07 14:47:31 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-07 14:47:31 +0000
commit2d8edaf17510e50261b8a4e2a0daf7e617674999 (patch)
treea26d3d0ae5543690d5132e4ed5a4095616850fe1 /src/gpu/effects/GrColorTableEffect.cpp
parent4592df8e9142803c44334273f1b4f37d09ec65dd (diff)
Try r5428 again with fix
git-svn-id: http://skia.googlecode.com/svn/trunk@5431 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects/GrColorTableEffect.cpp')
-rw-r--r--src/gpu/effects/GrColorTableEffect.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/effects/GrColorTableEffect.cpp b/src/gpu/effects/GrColorTableEffect.cpp
index 56c51090be..d662398d4a 100644
--- a/src/gpu/effects/GrColorTableEffect.cpp
+++ b/src/gpu/effects/GrColorTableEffect.cpp
@@ -65,20 +65,20 @@ void GrGLColorTableEffect::emitFS(GrGLShaderBuilder* builder,
}
code->appendf("\t\t%s.a = ", outputColor);
- builder->emitCustomTextureLookup(samplers[0],
- "vec2(coord.a, 0.125)");
+ builder->appendTextureLookup(code, samplers[0], "vec2(coord.a, 0.125)");
+ code->append(";\n");
code->appendf("\t\t%s.r = ", outputColor);
- builder->emitCustomTextureLookup(samplers[0],
- "vec2(coord.r, 0.375)");
+ builder->appendTextureLookup(code, samplers[0], "vec2(coord.r, 0.375)");
+ code->append(";\n");
code->appendf("\t\t%s.g = ", outputColor);
- builder->emitCustomTextureLookup(samplers[0],
- "vec2(coord.g, 0.625)");
+ builder->appendTextureLookup(code, samplers[0], "vec2(coord.g, 0.625)");
+ code->append(";\n");
code->appendf("\t\t%s.b = ", outputColor);
- builder->emitCustomTextureLookup(samplers[0],
- "vec2(coord.b, 0.875)");
+ builder->appendTextureLookup(code, samplers[0], "vec2(coord.b, 0.875)");
+ code->append(";\n");
code->appendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
}