From 7ff2e371859982cad995f9d2a8cbdbb8601fc780 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 2 May 2012 19:27:44 +0000 Subject: [PATCH] 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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();