Moved SW path rendering path back to using TU/sampler #2. This reverts r3813

http://codereview.appspot.com/6159046/

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

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 84dd836257e1a877fce50ce6207368d26fc4a045..cbec9653de53aaa54435b26116042e915d1c0354 100644 (file)
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -228,7 +228,9 @@ bool GrSoftwarePathRenderer::onDrawPath(const SkPath& path,
         GrAssert(NULL != texture);
         GrDrawTarget::AutoDeviceCoordDraw adcd(target, stageMask);
         enum {
-            kPathMaskStage = GrPaint::kTotalStages+1,
+            // the SW path renderer shares this stage with glyph
+            // rendering (kGlyphMaskStage in GrBatchedTextContext)
+            kPathMaskStage = GrPaint::kTotalStages,
         };
         target->drawState()->setTexture(kPathMaskStage, texture);
         target->drawState()->sampler(kPathMaskStage)->reset();