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:20:32 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-07 14:20:32 +0000
commit4592df8e9142803c44334273f1b4f37d09ec65dd (patch)
tree30586e70775eeada778bf6efa8c08a08dbe604d0 /src/gpu/effects/GrColorTableEffect.cpp
parent78201c27a7adf6772a067a47d7aa0e31eb614820 (diff)
Revert 5428 and 5429.
git-svn-id: http://skia.googlecode.com/svn/trunk@5430 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 d662398d4a..56c51090be 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->appendTextureLookup(code, samplers[0], "vec2(coord.a, 0.125)");
- code->append(";\n");
+ builder->emitCustomTextureLookup(samplers[0],
+ "vec2(coord.a, 0.125)");
code->appendf("\t\t%s.r = ", outputColor);
- builder->appendTextureLookup(code, samplers[0], "vec2(coord.r, 0.375)");
- code->append(";\n");
+ builder->emitCustomTextureLookup(samplers[0],
+ "vec2(coord.r, 0.375)");
code->appendf("\t\t%s.g = ", outputColor);
- builder->appendTextureLookup(code, samplers[0], "vec2(coord.g, 0.625)");
- code->append(";\n");
+ builder->emitCustomTextureLookup(samplers[0],
+ "vec2(coord.g, 0.625)");
code->appendf("\t\t%s.b = ", outputColor);
- builder->appendTextureLookup(code, samplers[0], "vec2(coord.b, 0.875)");
- code->append(";\n");
+ builder->emitCustomTextureLookup(samplers[0],
+ "vec2(coord.b, 0.875)");
code->appendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
}