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
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index b9d17f8..b23ed9a 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -16,9 +16,9 @@
static GrVertexLayout aa_rect_layout(bool useCoverage) {
GrVertexLayout layout = 0;
if (useCoverage) {
- layout |= GrDrawTarget::kCoverage_VertexLayoutBit;
+ layout |= GrDrawState::kCoverage_VertexLayoutBit;
} else {
- layout |= GrDrawTarget::kColor_VertexLayoutBit;
+ layout |= GrDrawState::kColor_VertexLayoutBit;
}
return layout;
}
@@ -127,7 +127,7 @@
bool useVertexCoverage) {
GrVertexLayout layout = aa_rect_layout(useVertexCoverage);
- size_t vsize = GrDrawTarget::VertexSize(layout);
+ size_t vsize = GrDrawState::VertexSize(layout);
GrDrawTarget::AutoReleaseGeometry geo(target, layout, 8, 0);
if (!geo.succeeded()) {
@@ -196,7 +196,7 @@
return;
}
GrVertexLayout layout = aa_rect_layout(useVertexCoverage);
- size_t vsize = GrDrawTarget::VertexSize(layout);
+ size_t vsize = GrDrawState::VertexSize(layout);
GrDrawTarget::AutoReleaseGeometry geo(target, layout, 16, 0);
if (!geo.succeeded()) {