commit ffca400ef6f96a280c3e2c09210f950af64a1f24
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Feb 22 20:34:01 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Feb 22 20:34:01 2011 +0000
tree 2292badadfe451a456616652c8df3291d8a80158
parent bdee9fc778d4387d805d717f2cd7fc7074991fdb

Make a separate path renderer object. Move enum types to GrTypes.h

Review URL http://codereview.appspot.com/4167067/



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

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index faa31f6..3bf157b 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -584,10 +584,10 @@
 }
 
 // must be in SkCanvas::PointMode order
-static const GrDrawTarget::PrimitiveType gPointMode2PrimtiveType[] = {
-    GrDrawTarget::kPoints_PrimitiveType,
-    GrDrawTarget::kLines_PrimitiveType,
-    GrDrawTarget::kLineStrip_PrimitiveType
+static const GrPrimitiveType gPointMode2PrimtiveType[] = {
+    kPoints_PrimitiveType,
+    kLines_PrimitiveType,
+    kLineStrip_PrimitiveType
 };
 
 void SkGpuDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
@@ -774,21 +774,21 @@
         return;
     }
 
-    GrContext::PathFills fill = GrContext::kHairLine_PathFill;
+    GrPathFill fill = kHairLine_PathFill;
 
     if (doFill) {
         switch (pathPtr->getFillType()) {
             case SkPath::kWinding_FillType:
-                fill = GrContext::kWinding_PathFill;
+                fill = kWinding_PathFill;
                 break;
             case SkPath::kEvenOdd_FillType:
-                fill = GrContext::kEvenOdd_PathFill;
+                fill = kEvenOdd_PathFill;
                 break;
             case SkPath::kInverseWinding_FillType:
-                fill = GrContext::kInverseWinding_PathFill;
+                fill = kInverseWinding_PathFill;
                 break;
             case SkPath::kInverseEvenOdd_FillType:
-                fill = GrContext::kInverseEvenOdd_PathFill;
+                fill = kInverseEvenOdd_PathFill;
                 break;
             default:
                 SkDebugf("Unsupported path fill type\n");
@@ -986,10 +986,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // must be in SkCanvas::VertexMode order
-static const GrDrawTarget::PrimitiveType gVertexMode2PrimitiveType[] = {
-    GrDrawTarget::kTriangles_PrimitiveType,
-    GrDrawTarget::kTriangleStrip_PrimitiveType,
-    GrDrawTarget::kTriangleFan_PrimitiveType,
+static const GrPrimitiveType gVertexMode2PrimitiveType[] = {
+    kTriangles_PrimitiveType,
+    kTriangleStrip_PrimitiveType,
+    kTriangleFan_PrimitiveType,
 };
 
 void SkGpuDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode,