Move vertex layout definitions from GrDrawTarget to GrDrawState.

This is the first step in revising vertex layouts so that the currently
installed GrEffects determine the current vertex layout.

https://codereview.appspot.com/7235051/


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

1 files changed, 2 insertions, 2 deletions

diff --git a/experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp b/experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp
index f74a57a0c3..2050f091a6 100644
--- a/experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp
+++ b/experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp
@@ -37,7 +37,7 @@ bool GrAndroidPathRenderer::onDrawPath(const SkPath& origPath,
                                                           &vertices);
 
     // set vertex layout depending on anti-alias
-    GrVertexLayout layout = antiAlias ? GrDrawTarget::kCoverage_VertexLayoutBit : 0;
+    GrVertexLayout layout = antiAlias ? GrDrawState::kCoverage_VertexLayoutBit : 0;
 
     // allocate our vert buffer
     int vertCount = vertices.getSize();
@@ -63,7 +63,7 @@ bool GrAndroidPathRenderer::onDrawPath(const SkPath& origPath,
             ++inVert;
         }
     } else {
-       size_t vsize = GrDrawTarget::VertexSize(layout);
+       size_t vsize = GrDrawState::VertexSize(layout);
        size_t copySize = vsize*vertCount;
        memcpy(geo.vertices(), vertices.getBuffer(), copySize);
     }