commit aa814fe4a148b05f9160a5f77cb4e630406ea62d
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 12 18:45:07 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 12 18:45:07 2011 +0000
tree 7c6cabf3451402200f130cdb5b42d5d9bcccaa49
parent 4d4f281b28c3db0513ea1a68db4577e2518002b3

Access sampler matrices directly, cleanup GrSamplerState::reset()s

Review URL: http://codereview.appspot.com/5488048/


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

gm/texdata.cpp

diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index 353c4c0..c68a16a 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -109,8 +109,9 @@
                 ctx->setMatrix(vm);
                 GrMatrix tm;
                 tm = vm;
-                tm.postIDiv(2*S, 2*S);
-                paint.textureSampler(0)->setMatrix(tm);
+                GrMatrix* sampleMat = paint.textureSampler(0)->matrix();
+                *sampleMat = vm;
+                sampleMat->postIDiv(2*S, 2*S);
                 paint.setTexture(0, texture);
 
                 ctx->drawRect(paint, GrRect::MakeWH(2*S, 2*S));