commit 1ce49fc91714ce8974d11246d29ebe7b97b5fe98
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Sep 18 14:14:49 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Sep 18 14:14:49 2012 +0000
tree 4e389ac0bcd225ccacf1ef0ef21c4266567c30dd
parent 10f9f4a844c8d5260c0a02df94b940b6abf66b0d

Move GrTextureParams from GrSamplerState to GrTextureAccess

Review URL: https://codereview.appspot.com/6496135/



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

src/gpu/GrTextContext.cpp

diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index edd92db..109fc6b 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -19,6 +19,7 @@
 #include "SkPath.h"
 
 enum {
+
     kGlyphMaskStage = GrPaint::kTotalStages,
 };
 
@@ -29,12 +30,12 @@
     GrDrawState* drawState = fDrawTarget->drawState();
     if (fCurrVertex > 0) {
         // setup our sampler state for our text texture/atlas
-        drawState->sampler(kGlyphMaskStage)->reset(SkShader::kRepeat_TileMode,
-                                                   !fExtMatrix.isIdentity());
+        drawState->sampler(kGlyphMaskStage)->reset();
 
         GrAssert(GrIsALIGN4(fCurrVertex));
         GrAssert(fCurrTexture);
-        drawState->createTextureEffect(kGlyphMaskStage, fCurrTexture);
+        GrTextureParams params(SkShader::kRepeat_TileMode, !fExtMatrix.isIdentity());
+        drawState->createTextureEffect(kGlyphMaskStage, fCurrTexture, params);
 
         if (!GrPixelConfigIsAlphaOnly(fCurrTexture->config())) {
             if (kOne_GrBlendCoeff != fPaint.fSrcBlendCoeff ||