commit 39ee0ffa72fbd5df6d3ec6db4fdad0c1bc3946fd
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 06 15:32:52 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 06 15:32:52 2011 +0000
tree 02cd7e93425776b39d82b5f4673832d058e57502
parent b0c5e078d8af06ec3ce5ea2cdc86c2f1084457a2

Prep #1 for making GrDrawState a class

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




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

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 9f82a15..335b9f4 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1551,7 +1551,7 @@
     }
 
     GrPathRenderer::AutoClearPath arp(pr, target, &path, fill, prAA, translate);
-    GrDrawTarget::StageBitfield stageMask = paint.getActiveStageMask();
+    GrDrawState::StageMask stageMask = paint.getActiveStageMask();
 
     if (doOSAA) {
         bool needsStencil = pr->requiresStencilPass(target, path, fill);
@@ -1925,7 +1925,7 @@
         int s = i + GrPaint::kFirstTextureStage;
         target->setTexture(s, paint.getTexture(i));
         ASSERT_OWNED_RESOURCE(paint.getTexture(i));
-        target->setSamplerState(s, *paint.getTextureSampler(i));
+        target->setSamplerState(s, paint.getTextureSampler(i));
     }
 
     target->setFirstCoverageStage(GrPaint::kFirstMaskStage);
@@ -1934,7 +1934,7 @@
         int s = i + GrPaint::kFirstMaskStage;
         target->setTexture(s, paint.getMask(i));
         ASSERT_OWNED_RESOURCE(paint.getMask(i));
-        target->setSamplerState(s, *paint.getMaskSampler(i));
+        target->setSamplerState(s, paint.getMaskSampler(i));
     }
 
     target->setColor(paint.fColor);