commit e85a32d4f8ce7fb9b6aaae89137dbf3766d833f2
author robertphillips <robertphillips@google.com> Tue Feb 10 08:16:55 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Feb 10 08:16:55 2015 -0800
tree 3b6a65e0ef71425284e4cf4f1f40faf58255ec55
parent ac928f27ab632784d6b9572901201caa2908caa5

Clean up clipping code a bit

Review URL: https://codereview.chromium.org/913693002

src/gpu/GrClipMaskManager.cpp

diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 0226ac1..f69c871 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -23,7 +23,6 @@
 #include "effects/GrRRectEffect.h"
 #include "effects/GrTextureDomain.h"
 
-#define GR_AA_CLIP 1
 typedef SkClipStack::Element Element;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -153,7 +152,7 @@
 
         if (!skip) {
             GrPrimitiveEdgeType edgeType;
-            if (GR_AA_CLIP && iter.get()->isAA()) {
+            if (iter.get()->isAA()) {
                 if (rt->isMultisampled()) {
                     // Coverage based AA clips don't place nicely with MSAA.
                     failed = true;
@@ -276,7 +275,6 @@
         }
     }
 
-#if GR_AA_CLIP
     // If MSAA is enabled we can do everything in the stencil buffer.
     if (0 == rt->numSamples() && requiresAA) {
         GrTexture* result = NULL;
@@ -314,7 +312,6 @@
         }
         // if alpha clip mask creation fails fall through to the non-AA code paths
     }
-#endif // GR_AA_CLIP
 
     // Either a hard (stencil buffer) clip was explicitly requested or an anti-aliased clip couldn't
     // be created. In either case, free up the texture in the anti-aliased mask cache.