Reland r5963 with two fixes:

Missing ref in GrSweepGradient::TestCreate.
Must reset() the sampler in setup_drawstate_aaclip() to avoid hitting a (dubious) assert.



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

1 files changed, 3 insertions, 6 deletions

diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index 724b4ec826..09721acc13 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -112,12 +112,9 @@ protected:
                 ctx->setMatrix(vm);
                 GrMatrix tm;
                 tm = vm;
-                GrMatrix* sampleMat = paint.colorSampler(0)->matrix();
-                *sampleMat = vm;
-                sampleMat->postIDiv(2*S, 2*S);
-                paint.colorSampler(0)->setCustomStage(
-                    SkNEW_ARGS(GrSingleTextureEffect, (texture)))->unref();
-
+                tm.postIDiv(2*S, 2*S);
+                paint.colorSampler(0)->setCustomStage(SkNEW_ARGS(GrSingleTextureEffect,
+                                                                 (texture)), tm)->unref();
 
                 ctx->drawRect(paint, GrRect::MakeWH(2*S, 2*S));