commit f6eac8af585e44d56e6b18d269e6c34f9917ea88
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 16 14:31:26 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 16 14:31:26 2012 +0000
tree 46332930405593186d0956fb29f093cd0afff80f
parent b022177777c3602c47bb71c07920e63a261c5038

Revert r5962 because of failures.



git-svn-id: http://skia.googlecode.com/svn/trunk@5963 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/texdata.cpp

diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index 09721ac..724b4ec 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -112,9 +112,12 @@
                 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));