aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/SkGpuDevice.cpp
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-07-20 16:17:03 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-07-20 16:17:03 +0000
commit96291dfa7054545327b34016882ca57f40a1fc81 (patch)
tree432083986a6b9db94bc148f8f30d85d232364314 /src/gpu/SkGpuDevice.cpp
parent80214e26c57c5fea954006400852e8999e201923 (diff)
Remove assertion when texture matrix is unused
Review URL: http://codereview.appspot.com/6420054/ git-svn-id: http://skia.googlecode.com/svn/trunk@4693 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/SkGpuDevice.cpp')
-rw-r--r--src/gpu/SkGpuDevice.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 18f2ff52f2..32d5883edd 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -514,9 +514,6 @@ inline bool skPaint2GrPaintNoShader(SkGpuDevice* dev,
GrSamplerState* colorSampler = grPaint->textureSampler(kColorFilterTextureIdx);
GrTexture* texture = act->set(dev, colorTransformTable, colorSampler);
- // 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 {