commit 9381363050ec9d3e724076a8e9152bfa9a8de1d1
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 27 20:21:16 2011 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 27 20:21:16 2011 +0000
tree dfb55ed16d0ba0db6671c880bb320198501231c5
parent 13788bfbedc2528fbfa71162c888908c88f03ac2

Extract GrDrawTarget::DrState into independent GrDrawState struct.
This is intended to be a first step towards making the stack of states
maintained by GrDrawTarget cheaper to maintain.



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

src/gpu/GrDefaultPathRenderer.cpp

diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 52decb4..a8f673e 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -9,6 +9,7 @@
 #include "GrDefaultPathRenderer.h"
 
 #include "GrContext.h"
+#include "GrDrawState.h"
 #include "GrPathUtils.h"
 #include "SkString.h"
 #include "SkTrace.h"
@@ -244,7 +245,7 @@
     }
 
     GrVertexLayout layout = 0;
-    for (int s = 0; s < GrDrawTarget::kNumStages; ++s) {
+    for (int s = 0; s < GrDrawState::kNumStages; ++s) {
         if ((1 << s) & stages) {
             layout |= GrDrawTarget::StagePosAsTexCoordVertexLayoutBit(s);
         }
@@ -406,11 +407,11 @@
     GrDrawTarget::AutoStateRestore asr(fTarget);
     bool colorWritesWereDisabled = fTarget->isColorWriteDisabled();
     // face culling doesn't make sense here
-    GrAssert(GrDrawTarget::kBoth_DrawFace == fTarget->getDrawFace());
+    GrAssert(GrDrawState::kBoth_DrawFace == fTarget->getDrawFace());
 
     int                         passCount = 0;
     const GrStencilSettings*    passes[3];
-    GrDrawTarget::DrawFace      drawFace[3];
+    GrDrawState::DrawFace       drawFace[3];
     bool                        reverse = false;
     bool                        lastPassIsBounds;
 
@@ -422,7 +423,7 @@
             passes[0] = NULL;
         }
         lastPassIsBounds = false;
-        drawFace[0] = GrDrawTarget::kBoth_DrawFace;
+        drawFace[0] = GrDrawState::kBoth_DrawFace;
     } else {
         if (single_pass_path(*fTarget, *fPath, fFill)) {
             passCount = 1;
@@ -431,7 +432,7 @@
             } else {
                 passes[0] = NULL;
             }
-            drawFace[0] = GrDrawTarget::kBoth_DrawFace;
+            drawFace[0] = GrDrawState::kBoth_DrawFace;
             lastPassIsBounds = false;
         } else {
             switch (fFill) {
@@ -452,7 +453,7 @@
                             passes[1] = &gEOColorPass;
                         }
                     }
-                    drawFace[0] = drawFace[1] = GrDrawTarget::kBoth_DrawFace;
+                    drawFace[0] = drawFace[1] = GrDrawState::kBoth_DrawFace;
                     break;
 
                 case kInverseWinding_PathFill:
@@ -466,7 +467,7 @@
                             passes[0] = &gWindStencilSeparateNoWrap;
                         }
                         passCount = 2;
-                        drawFace[0] = GrDrawTarget::kBoth_DrawFace;
+                        drawFace[0] = GrDrawState::kBoth_DrawFace;
                     } else {
                         if (fStencilWrapOps) {
                             passes[0] = &gWindSingleStencilWithWrapInc;
@@ -476,8 +477,8 @@
                             passes[1] = &gWindSingleStencilNoWrapDec;
                         }
                         // which is cw and which is ccw is arbitrary.
-                        drawFace[0] = GrDrawTarget::kCW_DrawFace;
-                        drawFace[1] = GrDrawTarget::kCCW_DrawFace;
+                        drawFace[0] = GrDrawState::kCW_DrawFace;
+                        drawFace[1] = GrDrawState::kCCW_DrawFace;
                         passCount = 3;
                     }
                     if (stencilOnly) {
@@ -485,7 +486,7 @@
                         --passCount;
                     } else {
                         lastPassIsBounds = true;
-                        drawFace[passCount-1] = GrDrawTarget::kBoth_DrawFace;
+                        drawFace[passCount-1] = GrDrawState::kBoth_DrawFace;
                         if (reverse) {
                             passes[passCount-1] = &gInvWindColorPass;
                         } else {