aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-02 19:27:44 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-02 19:27:44 +0000
commit7ff2e371859982cad995f9d2a8cbdbb8601fc780 (patch)
treee3cff68e3f617f7cad1a588377bef12d83f854d0 /src
parent16d1d0b39a78fa4ab4fbd6ed3296cf010ea9a61c (diff)
Moved SW path rendering path back to using TU/sampler #2. This reverts r3813
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrSoftwarePathRenderer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 84dd836257..cbec9653de 100644
--- 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();