Fix color filter LUT (install custom stage after reset of sampler). Over the shoulder review by TomH.
git-svn-id: http://skia.googlecode.com/svn/trunk@4691 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index d6e3783..18f2ff5 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -514,11 +514,11 @@
GrSamplerState* colorSampler = grPaint->textureSampler(kColorFilterTextureIdx);
GrTexture* texture = act->set(dev, colorTransformTable, colorSampler);
- colorSampler->setCustomStage(SkNEW_ARGS(GrColorTableEffect, (texture)))->unref();
// reset() sets the sampler's matrix to I. The custom stage doesn't require the matrix.
// The shader generator will omit the matrix if it is I. Once the matrix is moved from the
// sampler state to the custom stage this will no longer be necessary.
colorSampler->reset(GrSamplerState::kClamp_WrapMode, GrSamplerState::kNearest_Filter);
+ colorSampler->setCustomStage(SkNEW_ARGS(GrColorTableEffect, (texture)))->unref();
} else {
grPaint->resetColorFilter();
}