commit e3d3216fe17b6afb2e613271b5246a2766e12df6
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 20 13:37:06 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 20 13:37:06 2012 +0000
tree b5e9b1a72df637677148dd91262d793000ff594c
parent 426aebc8502654642bebfdda22af8acdae84cf05

Remove stage masks

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



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

src/gpu/GrSoftwarePathRenderer.cpp

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 5ab5fb4..ddd5b7a 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -71,30 +71,32 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void draw_around_inv_path(GrDrawTarget* target,
-                          GrDrawState::StageMask stageMask,
                           const GrIRect& clipBounds,
                           const GrIRect& pathBounds) {
-    GrDrawTarget::AutoDeviceCoordDraw adcd(target, stageMask);
+    GrDrawTarget::AutoDeviceCoordDraw adcd(target);
+    if (!adcd.succeeded()) {
+        return;
+    }
     GrRect rect;
     if (clipBounds.fTop < pathBounds.fTop) {
         rect.iset(clipBounds.fLeft, clipBounds.fTop, 
                     clipBounds.fRight, pathBounds.fTop);
-        target->drawSimpleRect(rect, NULL, stageMask);
+        target->drawSimpleRect(rect, NULL);
     }
     if (clipBounds.fLeft < pathBounds.fLeft) {
         rect.iset(clipBounds.fLeft, pathBounds.fTop, 
                     pathBounds.fLeft, pathBounds.fBottom);
-        target->drawSimpleRect(rect, NULL, stageMask);
+        target->drawSimpleRect(rect, NULL);
     }
     if (clipBounds.fRight > pathBounds.fRight) {
         rect.iset(pathBounds.fRight, pathBounds.fTop, 
                     clipBounds.fRight, pathBounds.fBottom);
-        target->drawSimpleRect(rect, NULL, stageMask);
+        target->drawSimpleRect(rect, NULL);
     }
     if (clipBounds.fBottom > pathBounds.fBottom) {
         rect.iset(clipBounds.fLeft, pathBounds.fBottom, 
                     clipBounds.fRight, clipBounds.fBottom);
-        target->drawSimpleRect(rect, NULL, stageMask);
+        target->drawSimpleRect(rect, NULL);
     }
 }
 
@@ -106,7 +108,6 @@
                                         GrPathFill fill,
                                         const GrVec* translate,
                                         GrDrawTarget* target,
-                                        GrDrawState::StageMask stageMask,
                                         bool antiAlias) {
 
     if (NULL == fContext) {
@@ -124,8 +125,7 @@
     if (!get_path_and_clip_bounds(target, path, vm,
                                   &pathBounds, &clipBounds)) {
         if (GrIsFillInverted(fill)) {
-            draw_around_inv_path(target, stageMask,
-                                 clipBounds, pathBounds);
+            draw_around_inv_path(target, clipBounds, pathBounds);
         }
         return true;
     }
@@ -138,12 +138,10 @@
         return false;
     }
 
-    GrSWMaskHelper::DrawToTargetWithPathMask(texture, target, 
-                                             stageMask, pathBounds);
+    GrSWMaskHelper::DrawToTargetWithPathMask(texture, target, pathBounds);
 
     if (GrIsFillInverted(fill)) {
-        draw_around_inv_path(target, stageMask,
-                                clipBounds, pathBounds);
+        draw_around_inv_path(target, clipBounds, pathBounds);
     }
 
     return true;