commit 8059eb9f6e24ed609393fbda4ad71edea03ac258
author joshualitt <joshualitt@chromium.org> Mon Dec 29 15:10:07 2014 -0800
committer Commit bot <commit-bot@chromium.org> Mon Dec 29 15:10:07 2014 -0800
tree c9a8e1881739206f49a5319bf1077a5900b42db1
parent 4f662e62cd44e302ef689fabdb2c0ae8d9471b02

Move ViewMatrix off of drawstate

BUG=skia:

Review URL: https://codereview.chromium.org/815553003

gm/beziereffects.cpp

diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index b486404..dd15aed 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -92,7 +92,8 @@
                         continue;
                     }
                     GrPrimitiveEdgeType et = (GrPrimitiveEdgeType)edgeType;
-                    gp.reset(GrCubicEffect::Create(0xff000000, et, *tt.target()->caps()));
+                    gp.reset(GrCubicEffect::Create(0xff000000, SkMatrix::I(), et,
+                                                   *tt.target()->caps()));
                     if (!gp) {
                         continue;
                     }
@@ -250,8 +251,8 @@
                         continue;
                     }
                     GrPrimitiveEdgeType et = (GrPrimitiveEdgeType)edgeType;
-                    gp.reset(GrConicEffect::Create(0xff000000, et, *tt.target()->caps(),
-                                                   SkMatrix::I()));
+                    gp.reset(GrConicEffect::Create(0xff000000, SkMatrix::I(), et,
+                                                   *tt.target()->caps(), SkMatrix::I()));
                     if (!gp) {
                         continue;
                     }
@@ -440,8 +441,8 @@
                         continue;
                     }
                     GrPrimitiveEdgeType et = (GrPrimitiveEdgeType)edgeType;
-                    gp.reset(GrQuadEffect::Create(0xff000000, et, *tt.target()->caps(),
-                                                  SkMatrix::I()));
+                    gp.reset(GrQuadEffect::Create(0xff000000, SkMatrix::I(), et,
+                                                  *tt.target()->caps(), SkMatrix::I()));
                     if (!gp) {
                         continue;
                     }

gm/convexpolyeffect.cpp

diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 65a1816..68610e0 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -134,7 +134,8 @@
 
                 GrDrawState ds;
                 SkAutoTUnref<const GrGeometryProcessor> gp(
-                        GrDefaultGeoProcFactory::Create(0xff000000));
+                        GrDefaultGeoProcFactory::Create(GrDefaultGeoProcFactory::kPosition_GPType,
+                                                        0xff000000));
                 ds.addCoverageProcessor(fp);
                 ds.setRenderTarget(rt);
 
@@ -190,7 +191,8 @@
 
                 GrDrawState ds;
                 SkAutoTUnref<const GrGeometryProcessor> gp(
-                        GrDefaultGeoProcFactory::Create(0xff000000));
+                        GrDefaultGeoProcFactory::Create(GrDefaultGeoProcFactory::kPosition_GPType,
+                                                        0xff000000));
                 ds.addCoverageProcessor(fp);
                 ds.setRenderTarget(rt);
 

gm/rrects.cpp

diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index bacc819..e6c62e9 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -126,7 +126,8 @@
                             SkRect bounds = rrect.getBounds();
                             bounds.outset(2.f, 2.f);
 
-                            tt.target()->drawSimpleRect(&drawState, 0xff000000, bounds);
+                            tt.target()->drawSimpleRect(&drawState, 0xff000000, SkMatrix::I(),
+                                                        bounds);
                         } else {
                             drew = false;
                         }

gm/texturedomaineffect.cpp

diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index beb98b6..8a59532 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -130,11 +130,11 @@
                     }
                     SkMatrix viewMatrix;
                     viewMatrix.setTranslate(x, y);
-                    GrDrawState drawState(viewMatrix);
+                    GrDrawState drawState;
                     drawState.setRenderTarget(rt);
                     drawState.addColorProcessor(fp);
 
-                    tt.target()->drawSimpleRect(&drawState, GrColor_WHITE, renderRect);
+                    tt.target()->drawSimpleRect(&drawState, GrColor_WHITE, viewMatrix, renderRect);
                     x += renderRect.width() + kTestPad;
                 }
                 y += renderRect.height() + kTestPad;

gm/yuvtorgbeffect.cpp

diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index dbf9cd8..ed551ff 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -115,10 +115,10 @@
                 if (fp) {
                     SkMatrix viewMatrix;
                     viewMatrix.setTranslate(x, y);
-                    GrDrawState drawState(viewMatrix);
+                    GrDrawState drawState;
                     drawState.setRenderTarget(rt);
                     drawState.addColorProcessor(fp);
-                    tt.target()->drawSimpleRect(&drawState, GrColor_WHITE, renderRect);
+                    tt.target()->drawSimpleRect(&drawState, GrColor_WHITE, viewMatrix, renderRect);
                 }
                 x += renderRect.width() + kTestPad;
             }