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

src/gpu/GrGpuGL.cpp

diff --git a/src/gpu/GrGpuGL.cpp b/src/gpu/GrGpuGL.cpp
index fb16b22..f266368 100644
--- a/src/gpu/GrGpuGL.cpp
+++ b/src/gpu/GrGpuGL.cpp
@@ -518,7 +518,7 @@
         fHWDrawState.sampler(s)->setRadial2Params(-GR_ScalarMax,
                                                   -GR_ScalarMax,
                                                   true);
-        fHWDrawState.sampler(s)->setMatrix(GrMatrix::InvalidMatrix());
+        *fHWDrawState.sampler(s)->matrix() = GrMatrix::InvalidMatrix();
         fHWDrawState.sampler(s)->setConvolutionParams(0, NULL, NULL);
     }