aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-16 14:31:26 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-16 14:31:26 +0000
commitf6eac8af585e44d56e6b18d269e6c34f9917ea88 (patch)
tree46332930405593186d0956fb29f093cd0afff80f /gm
parentb022177777c3602c47bb71c07920e63a261c5038 (diff)
Revert r5962 because of failures.
git-svn-id: http://skia.googlecode.com/svn/trunk@5963 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
-rw-r--r--gm/texdata.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index 09721acc13..724b4ec826 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -112,9 +112,12 @@ protected:
ctx->setMatrix(vm);
GrMatrix tm;
tm = vm;
- tm.postIDiv(2*S, 2*S);
- paint.colorSampler(0)->setCustomStage(SkNEW_ARGS(GrSingleTextureEffect,
- (texture)), tm)->unref();
+ GrMatrix* sampleMat = paint.colorSampler(0)->matrix();
+ *sampleMat = vm;
+ sampleMat->postIDiv(2*S, 2*S);
+ paint.colorSampler(0)->setCustomStage(
+ SkNEW_ARGS(GrSingleTextureEffect, (texture)))->unref();
+
ctx->drawRect(paint, GrRect::MakeWH(2*S, 2*S));