commit ca47aae7ecfdafb5e88baee13737908b79a4c716
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Dec 12 15:58:25 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Dec 12 15:58:25 2012 +0000
tree ddbff3f5142108238e24e4ec384abd7d19bcb57b
parent fb883bf80422c4763921b3d6e2a9ac81596e77bf

Minor cleanup

https://codereview.appspot.com/6927054/



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

src/gpu/GrAARectRenderer.cpp

diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 595b575..c62eeb7 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -13,8 +13,7 @@
 
 namespace {
 
-static GrVertexLayout aa_rect_layout(const GrDrawTarget* target,
-                                     bool useCoverage) {
+static GrVertexLayout aa_rect_layout(bool useCoverage) {
     GrVertexLayout layout = 0;
     if (useCoverage) {
         layout |= GrDrawTarget::kCoverage_VertexLayoutBit;
@@ -24,8 +23,8 @@
     return layout;
 }
 
-static void setInsetFan(GrPoint* pts, size_t stride,
-                        const GrRect& r, SkScalar dx, SkScalar dy) {
+static void set_inset_fan(GrPoint* pts, size_t stride,
+                          const GrRect& r, SkScalar dx, SkScalar dy) {
     pts->setRectFan(r.fLeft + dx, r.fTop + dy,
                     r.fRight - dx, r.fBottom - dy, stride);
 }
@@ -106,7 +105,7 @@
                                   GrDrawTarget* target,
                                   const GrRect& devRect,
                                   bool useVertexCoverage) {
-    GrVertexLayout layout = aa_rect_layout(target, useVertexCoverage);
+    GrVertexLayout layout = aa_rect_layout(useVertexCoverage);
 
     size_t vsize = GrDrawTarget::VertexSize(layout);
 
@@ -126,8 +125,8 @@
     GrPoint* fan0Pos = reinterpret_cast<GrPoint*>(verts);
     GrPoint* fan1Pos = reinterpret_cast<GrPoint*>(verts + 4 * vsize);
 
-    setInsetFan(fan0Pos, vsize, devRect, -SK_ScalarHalf, -SK_ScalarHalf);
-    setInsetFan(fan1Pos, vsize, devRect,  SK_ScalarHalf,  SK_ScalarHalf);
+    set_inset_fan(fan0Pos, vsize, devRect, -SK_ScalarHalf, -SK_ScalarHalf);
+    set_inset_fan(fan1Pos, vsize, devRect,  SK_ScalarHalf,  SK_ScalarHalf);
 
     verts += sizeof(GrPoint);
     for (int i = 0; i < 4; ++i) {
@@ -175,7 +174,7 @@
         this->fillAARect(gpu, target, r, useVertexCoverage);
         return;
     }
-    GrVertexLayout layout = aa_rect_layout(target, useVertexCoverage);
+    GrVertexLayout layout = aa_rect_layout(useVertexCoverage);
     size_t vsize = GrDrawTarget::VertexSize(layout);
 
     GrDrawTarget::AutoReleaseGeometry geo(target, layout, 16, 0);
@@ -199,14 +198,14 @@
     GrPoint* fan2Pos = reinterpret_cast<GrPoint*>(verts + 8 * vsize);
     GrPoint* fan3Pos = reinterpret_cast<GrPoint*>(verts + 12 * vsize);
 
-    setInsetFan(fan0Pos, vsize, devRect,
-                -rx - SK_ScalarHalf, -ry - SK_ScalarHalf);
-    setInsetFan(fan1Pos, vsize, devRect,
-                -rx + SK_ScalarHalf, -ry + SK_ScalarHalf);
-    setInsetFan(fan2Pos, vsize, devRect,
-                rx - SK_ScalarHalf,  ry - SK_ScalarHalf);
-    setInsetFan(fan3Pos, vsize, devRect,
-                rx + SK_ScalarHalf,  ry + SK_ScalarHalf);
+    set_inset_fan(fan0Pos, vsize, devRect,
+                  -rx - SK_ScalarHalf, -ry - SK_ScalarHalf);
+    set_inset_fan(fan1Pos, vsize, devRect,
+                  -rx + SK_ScalarHalf, -ry + SK_ScalarHalf);
+    set_inset_fan(fan2Pos, vsize, devRect,
+                  rx - SK_ScalarHalf,  ry - SK_ScalarHalf);
+    set_inset_fan(fan3Pos, vsize, devRect,
+                  rx + SK_ScalarHalf,  ry + SK_ScalarHalf);
 
     // The outermost rect has 0 coverage
     verts += sizeof(GrPoint);