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/GrClipMaskManager.cpp

diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 7c54009..ebeaefa 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -367,7 +367,7 @@
     // The ClipMaskManager accumulates the clip mask in the UL corner
     GrIRect rect = GrIRect::MakeWH(resultBounds.width(), resultBounds.height());
 
-    GrSWMaskHelper::DrawToTargetWithPathMask(texture, gpu, 0, rect);
+    GrSWMaskHelper::DrawToTargetWithPathMask(texture, gpu, rect);
 
     GrAssert(!GrIsFillInverted(fill));
     return true;
@@ -387,7 +387,7 @@
         return draw_path_in_software(context, gpu, path, fill, doAA, resultBounds);
     }
 
-    pr->drawPath(path, fill, NULL, gpu, 0, doAA);
+    pr->drawPath(path, fill, NULL, gpu, doAA);
     return true;
 }
 
@@ -409,7 +409,7 @@
                                                           clipIn.getRect(index), 
                                                           true);
         } else {
-            fGpu->drawSimpleRect(clipIn.getRect(index), NULL, 0);
+            fGpu->drawSimpleRect(clipIn.getRect(index), NULL);
         }
     } else {
         return draw_path(this->getContext(), fGpu,
@@ -440,7 +440,7 @@
     GrRect rect = GrRect::MakeWH(SkIntToScalar(target->width()), 
                                  SkIntToScalar(target->height()));
 
-    fGpu->drawSimpleRect(rect, NULL, 1 << 0);
+    fGpu->drawSimpleRect(rect, NULL);
 
     drawState->disableStage(0);
 }
@@ -789,11 +789,11 @@
                 SET_RANDOM_COLOR
                 if (kRect_ClipType == clipCopy.getElementType(c)) {
                     *drawState->stencil() = gDrawToStencil;
-                    fGpu->drawSimpleRect(clipCopy.getRect(c), NULL, 0);
+                    fGpu->drawSimpleRect(clipCopy.getRect(c), NULL);
                 } else {
                     if (canRenderDirectToStencil) {
                         *drawState->stencil() = gDrawToStencil;
-                        pr->drawPath(*clipPath, fill, NULL, fGpu, 0, false);
+                        pr->drawPath(*clipPath, fill, NULL, fGpu, false);
                     } else {
                         pr->drawPathToStencil(*clipPath, fill, fGpu);
                     }
@@ -808,10 +808,10 @@
                 if (canDrawDirectToClip) {
                     if (kRect_ClipType == clipCopy.getElementType(c)) {
                         SET_RANDOM_COLOR
-                        fGpu->drawSimpleRect(clipCopy.getRect(c), NULL, 0);
+                        fGpu->drawSimpleRect(clipCopy.getRect(c), NULL);
                     } else {
                         SET_RANDOM_COLOR
-                        pr->drawPath(*clipPath, fill, NULL, fGpu, 0, false);
+                        pr->drawPath(*clipPath, fill, NULL, fGpu, false);
                     }
                 } else {
                     SET_RANDOM_COLOR
@@ -820,7 +820,7 @@
                             SkIntToScalar(bounds.fTop),
                             SkIntToScalar(bounds.fRight),
                             SkIntToScalar(bounds.fBottom));
-                    fGpu->drawSimpleRect(rect, NULL, 0);
+                    fGpu->drawSimpleRect(rect, NULL);
                 }
             }
         }