commit 7ff2e371859982cad995f9d2a8cbdbb8601fc780
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed May 02 19:27:44 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed May 02 19:27:44 2012 +0000
tree e3cff68e3f617f7cad1a588377bef12d83f854d0
parent 16d1d0b39a78fa4ab4fbd6ed3296cf010ea9a61c

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

src/gpu/GrSoftwarePathRenderer.cpp

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 84dd836..cbec965 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -228,7 +228,9 @@
         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();