commit b8670998a59d305cd22a3c0cbdc6e075b0a37a6e
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 25 21:27:09 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 25 21:27:09 2012 +0000
tree 76791b806a3a6608e5a5735150c0535dc50a872a
parent cc90505674cd845fcbebd7e0654c3ff04a2e4f25

Move filter/wrap out of GrSamplerState into GrTextureParams

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




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

src/gpu/GrClipMaskManager.cpp

diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 4deebf4..d7287ea 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -37,9 +37,7 @@
     mat.preTranslate(SkIntToScalar(-bound.fLeft), SkIntToScalar(-bound.fTop));
     mat.preConcat(drawState->getViewMatrix());
 
-    drawState->sampler(maskStage)->reset(GrSamplerState::kClamp_WrapMode,
-                                         GrSamplerState::kNearest_Filter,
-                                         mat);
+    drawState->sampler(maskStage)->reset(mat);
 
     drawState->createTextureEffect(maskStage, result);
 }
@@ -481,9 +479,7 @@
     GrMatrix sampleM;
     sampleM.setIDiv(texture->width(), texture->height());
 
-    drawState->sampler(0)->reset(GrSamplerState::kClamp_WrapMode,
-                                 GrSamplerState::kNearest_Filter,
-                                 sampleM);
+    drawState->sampler(0)->reset(sampleM);
     drawState->createTextureEffect(0, texture);
 
     GrRect rect = GrRect::MakeWH(SkIntToScalar(target->width()),