commit 115b06f3d51902a122621e897360ba80153527b3
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 15:47:55 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 15:47:55 2012 +0000
tree 82a6e178b304838e1a5e26d77c9476c547128f6e
parent c3a58f345de16c185db3a20578c7ddf52bc89d38

Re-revert r6233.



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

src/gpu/GrDrawState.h

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index b539441..3c6c3a3 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -198,16 +198,16 @@
     }
     void createTextureEffect(int stageIdx, GrTexture* texture, const GrMatrix& matrix) {
         GrAssert(!this->getStage(stageIdx).getEffect());
-        GrEffect* effect = SkNEW_ARGS(GrSingleTextureEffect, (texture, matrix));
-        this->stage(stageIdx)->setEffect(effect)->unref();
+        GrEffect* effect = SkNEW_ARGS(GrSingleTextureEffect, (texture));
+        this->stage(stageIdx)->setEffect(effect, matrix)->unref();
     }
     void createTextureEffect(int stageIdx,
                              GrTexture* texture,
                              const GrMatrix& matrix,
                              const GrTextureParams& params) {
         GrAssert(!this->getStage(stageIdx).getEffect());
-        GrEffect* effect = SkNEW_ARGS(GrSingleTextureEffect, (texture, matrix, params));
-        this->stage(stageIdx)->setEffect(effect)->unref();
+        GrEffect* effect = SkNEW_ARGS(GrSingleTextureEffect, (texture, params));
+        this->stage(stageIdx)->setEffect(effect, matrix)->unref();
     }