Re-enable nvpr text rendering in DM.

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

diff --git a/dm/DM.cpp b/dm/DM.cpp
index becea6ca6cf00c2c6eae2c548ec4692cd850628b..55651d9cdabc440083edc13c61e4c13fd4314eb5 100644 (file)
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -439,8 +439,8 @@ static Sink* create_sink(const char* tag) {
         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

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