commit 90e8ab79beffbe82fcd439eb84473f402224db7b
author bsalomon <bsalomon@google.com> Tue Sep 08 10:26:51 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Sep 08 10:26:51 2015 -0700
tree ab24588b6c0b4c7f7362724edd62481151600383
parent 54a6b1a1228489161294e4fa1fc8f93797cff259

Re-enable nvpr text rendering in DM.

Review URL: https://codereview.chromium.org/1306733007

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index becea6c..55651d9 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -439,8 +439,8 @@
         SINK("gpudft",        GPUSink, Gr::kNative_GLContextType,        api,  0,  true, FLAGS_gpu_threading);
         SINK("msaa4",         GPUSink, Gr::kNative_GLContextType,        api,  4, false, FLAGS_gpu_threading);
         SINK("msaa16",        GPUSink, Gr::kNative_GLContextType,        api, 16, false, FLAGS_gpu_threading);
-        SINK("nvprmsaa4",     GPUSink, Gr::kNVPR_GLContextType,          api,  4, false, FLAGS_gpu_threading);
-        SINK("nvprmsaa16",    GPUSink, Gr::kNVPR_GLContextType,          api, 16, false, FLAGS_gpu_threading);
+        SINK("nvprmsaa4",     GPUSink, Gr::kNVPR_GLContextType,          api,  4,  true, FLAGS_gpu_threading);
+        SINK("nvprmsaa16",    GPUSink, Gr::kNVPR_GLContextType,          api, 16,  true, FLAGS_gpu_threading);
     #if SK_ANGLE
         SINK("angle",         GPUSink, Gr::kANGLE_GLContextType,         api,  0, false, FLAGS_gpu_threading);
     #endif

src/gpu/GrStencilAndCoverTextContext.cpp

diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp
index 047cd07..479213b 100644
--- a/src/gpu/GrStencilAndCoverTextContext.cpp
+++ b/src/gpu/GrStencilAndCoverTextContext.cpp
@@ -443,7 +443,6 @@
 
         *pipelineBuilder.stencil() = kStencilPass;
 
-        SkASSERT(0 == fQueuedGlyphCount);
         SkASSERT(kGlyphBufferSize == fFallbackGlyphsIdx);
 
         dc->drawPaths(&pipelineBuilder, pp, fGlyphs,