commit f6eac8af585e44d56e6b18d269e6c34f9917ea88
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 16 14:31:26 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 16 14:31:26 2012 +0000
tree 46332930405593186d0956fb29f093cd0afff80f
parent b022177777c3602c47bb71c07920e63a261c5038

Revert r5962 because of failures.



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

src/gpu/GrDrawState.h

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 6306c33..69f0aea 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -194,17 +194,10 @@
         this->sampler(stage)->setCustomStage(
             SkNEW_ARGS(GrSingleTextureEffect, (texture)))->unref();
     }
-    void createTextureEffect(int stage, GrTexture* texture, const GrMatrix& matrix) {
+    void createTextureEffect(int stage, GrTexture* texture, const GrTextureParams& params) {
         GrAssert(!this->getSampler(stage).getCustomStage());
-        GrCustomStage* customStage = SkNEW_ARGS(GrSingleTextureEffect, (texture));
-        this->sampler(stage)->setCustomStage(customStage, matrix)->unref();
-    }
-    void createTextureEffect(int stage, GrTexture* texture,
-                             const GrMatrix& matrix,
-                             const GrTextureParams& params) {
-        GrAssert(!this->getSampler(stage).getCustomStage());
-        GrCustomStage* customStage = SkNEW_ARGS(GrSingleTextureEffect, (texture, params));
-        this->sampler(stage)->setCustomStage(customStage, matrix)->unref();
+        this->sampler(stage)->setCustomStage(
+            SkNEW_ARGS(GrSingleTextureEffect, (texture, params)))->unref();
     }