Beginning to refactor nvpr code

src/gpu/gl/GrGpuGL.cpp

Index: src/gpu/gl/GrGpuGL.cpp
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index a00333ddab78b05e05c27a1458729625fd1dc8c6..9d08f641eb7d8f4322d7615388fe032710e52ef1 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -1871,6 +1871,7 @@ void set_gl_stencil(const GrGLInterface* gl,
 }
 
 void GrGpuGL::flushStencil(const GrStencilSettings& stencilSettings, DrawType type) {
+    // TODO figure out why we need to flush stencil settings on path draws at all

[Kimmo Kinnunen, 2014/11/03 20:39:12]

Can you expand on this, what is the unknown part or why do you think the stencil
settings are not needed?
When drawing the paths (e.g. covering the paths), the covered pixels are changed
based on the stencil values. The way they're changed is defined by the stencil
settings

[bsalomon, 2014/11/03 20:49:34]

Our thought was that stencilSettings is more expressive than NVPR allows. The
fill type seems sufficient at the GrDT level. However, the clipping code needs
to be able to munge the stenciling in order to respect the current clip which
does require more expressiveness than just the fill type. We were thinking the
clipping code would read the fill type and then produce something for
GrGpu/GrPathRendering that more closely matches the semantics of NVPR than the
StencilSettings struct.

     if (kStencilPath_DrawType != type && fHWStencilSettings != stencilSettings) {
         if (stencilSettings.isDisabled()) {
             if (kNo_TriState != fHWStencilTestEnabled) {
@@ -1917,10 +1918,7 @@ void GrGpuGL::flushAAState(const GrOptDrawState& optState, DrawType type) {
     const GrRenderTarget* rt = optState.getRenderTarget();
     if (kGL_GrGLStandard == this->glStandard()) {
         if (RT_HAS_MSAA) {
-            // FIXME: GL_NV_pr doesn't seem to like MSAA disabled. The paths
-            // convex hulls of each segment appear to get filled.
-            bool enableMSAA = kStencilPath_DrawType == type ||
-                              optState.isHWAntialiasState();
+            bool enableMSAA = optState.isHWAntialiasState();
             if (enableMSAA) {
                 if (kYes_TriState != fMSAAEnabled) {
                     GL_CALL(Enable(GR_GL_MULTISAMPLE));