commit 1e8f016305805d4d8cad74aba3a21b78486f9d6f
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 20 16:25:18 2012 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 20 16:25:18 2012 +0000
tree af375e711e189cffeb808567c761af57c1b9c678
parent 96291dfa7054545327b34016882ca57f40a1fc81

Remove easily-removable uses of setTexture(), instead creating a GrSingleTextureEffect -
where feasible, through convenience function on GrDrawState.

http://codereview.appspot.com/6425055/



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

src/gpu/GrClipMaskManager.cpp

diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index ebeaefa..f313d68 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -41,7 +41,7 @@
                                          GrSamplerState::kNearest_Filter,
                                          mat);
 
-    drawState->setTexture(maskStage, result);
+    drawState->createTextureEffect(maskStage, result);
 }
 
 bool path_needs_SW_renderer(GrContext* context,
@@ -431,11 +431,11 @@
 
     GrMatrix sampleM;
     sampleM.setIDiv(texture->width(), texture->height());
-    drawState->setTexture(0, texture);
 
     drawState->sampler(0)->reset(GrSamplerState::kClamp_WrapMode,
                                  GrSamplerState::kNearest_Filter,
                                  sampleM);
+    drawState->createTextureEffect(0, texture);
 
     GrRect rect = GrRect::MakeWH(SkIntToScalar(target->width()), 
                                  SkIntToScalar(target->height()));