Revert "Turn NVPR on by default (but off in tools)."

src/gpu/gl/GrGLInterface.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLUtil.h"
 
 #include <stdio.h>
 
 #if GR_GL_PER_GL_FUNC_CALLBACK
 namespace {
 void GrGLDefaultInterfaceCallback(const GrGLInterface*) {}
 }
 #endif
 
-const GrGLInterface* GrGLInterfaceRemoveNVPR(const GrGLInterface* interface) {
-    GrGLInterface* newInterface = GrGLInterface::NewClone(interface);
-
-    newInterface->fExtensions.remove("GL_NV_path_rendering");
-
-    newInterface->fPathCommands = NULL;
-    newInterface->fPathCoords = NULL;
-    newInterface->fPathSubCommands = NULL;
-    newInterface->fPathSubCoords = NULL;
-    newInterface->fPathString = NULL;
-    newInterface->fPathGlyphs = NULL;
-    newInterface->fPathGlyphRange = NULL;
-    newInterface->fWeightPaths = NULL;
-    newInterface->fCopyPath = NULL;
-    newInterface->fInterpolatePaths = NULL;
-    newInterface->fTransformPath = NULL;
-    newInterface->fPathParameteriv = NULL;
-    newInterface->fPathParameteri = NULL;
-    newInterface->fPathParameterfv = NULL;
-    newInterface->fPathParameterf = NULL;
-    newInterface->fPathDashArray = NULL;
-    newInterface->fGenPaths = NULL;
-    newInterface->fDeletePaths = NULL;
-    newInterface->fIsPath = NULL;
-    newInterface->fPathStencilFunc = NULL;
-    newInterface->fPathStencilDepthOffset = NULL;
-    newInterface->fStencilFillPath = NULL;
-    newInterface->fStencilStrokePath = NULL;
-    newInterface->fStencilFillPathInstanced = NULL;
-    newInterface->fStencilStrokePathInstanced = NULL;
-    newInterface->fPathCoverDepthFunc = NULL;
-    newInterface->fPathColorGen = NULL;
-    newInterface->fPathTexGen = NULL;
-    newInterface->fPathFogGen = NULL;
-    newInterface->fCoverFillPath = NULL;
-    newInterface->fCoverStrokePath = NULL;
-    newInterface->fCoverFillPathInstanced = NULL;
-    newInterface->fCoverStrokePathInstanced = NULL;
-    newInterface->fGetPathParameteriv = NULL;
-    newInterface->fGetPathParameterfv = NULL;
-    newInterface->fGetPathCommands = NULL;
-    newInterface->fGetPathCoords = NULL;
-    newInterface->fGetPathDashArray = NULL;
-    newInterface->fGetPathMetrics = NULL;
-    newInterface->fGetPathMetricRange = NULL;
-    newInterface->fGetPathSpacing = NULL;
-    newInterface->fGetPathColorGeniv = NULL;
-    newInterface->fGetPathColorGenfv = NULL;
-    newInterface->fGetPathTexGeniv = NULL;
-    newInterface->fGetPathTexGenfv = NULL;
-    newInterface->fIsPointInFillPath = NULL;
-    newInterface->fIsPointInStrokePath = NULL;
-    newInterface->fGetPathLength = NULL;
-    newInterface->fPointAlongPath = NULL;
-
-    return newInterface;
-}
-
 GrGLInterface::GrGLInterface()
     // TODO: Remove this madness ASAP.
     : fActiveTexture(&fFunctions.fActiveTexture)
     , fAttachShader(&fFunctions.fAttachShader)
     , fBeginQuery(&fFunctions.fBeginQuery)
     , fBindAttribLocation(&fFunctions.fBindAttribLocation)
     , fBindBuffer(&fFunctions.fBindBuffer)
     , fBindFragDataLocation(&fFunctions.fBindFragDataLocation)
     , fBindFragDataLocationIndexed(&fFunctions.fBindFragDataLocationIndexed)
     , fBindFramebuffer(&fFunctions.fBindFramebuffer)
@@ skipping 167 matching lines @@
     , fGetPathMetrics(&fFunctions.fGetPathMetrics)
     , fGetPathMetricRange(&fFunctions.fGetPathMetricRange)
     , fGetPathSpacing(&fFunctions.fGetPathSpacing)
     , fGetPathColorGeniv(&fFunctions.fGetPathColorGeniv)
     , fGetPathColorGenfv(&fFunctions.fGetPathColorGenfv)
     , fGetPathTexGeniv(&fFunctions.fGetPathTexGeniv)
     , fGetPathTexGenfv(&fFunctions.fGetPathTexGenfv)
     , fIsPointInFillPath(&fFunctions.fIsPointInFillPath)
     , fIsPointInStrokePath(&fFunctions.fIsPointInStrokePath)
     , fGetPathLength(&fFunctions.fGetPathLength)
-    , fPointAlongPath(&fFunctions.fPointAlongPath) {
+    , fPointAlongPath(&fFunctions.fPointAlongPath)
+{
     fStandard = kNone_GrGLStandard;
 
 #if GR_GL_PER_GL_FUNC_CALLBACK
     fCallback = GrGLDefaultInterfaceCallback;
     fCallbackData = 0;
 #endif
 }
 
-GrGLInterface* GrGLInterface::NewClone(const GrGLInterface* interface) {
-    SkASSERT(NULL != interface);
-
-    GrGLInterface* clone = SkNEW(GrGLInterface);
-    clone->fStandard = interface->fStandard;
-    clone->fExtensions = interface->fExtensions;
-    clone->fFunctions = interface->fFunctions;
-#if GR_GL_PER_GL_FUNC_CALLBACK
-    clone->fCallback = interface->fCallback;
-    clone->fCallbackData = interface->fCallbackData;
-#endif
-    return clone;
-}
-
 bool GrGLInterface::validate() const {
 
     if (kNone_GrGLStandard == fStandard) {
         return false;
     }
 
     // This const hackery is necessary because the factories in Chromium do not yet initialize
     // fExtensions.
     if (!fExtensions.isInitialized()) {
         GrGLExtensions* extensions = const_cast<GrGLExtensions*>(&fExtensions);
@@ skipping 170 matching lines @@
                 NULL == fFunctions.fLoadIdentity ||
                 NULL == fFunctions.fLoadMatrixf ||
                 NULL == fFunctions.fMatrixMode ||
                 NULL == fFunctions.fTexGenf ||
                 NULL == fFunctions.fTexGenfv ||
                 NULL == fFunctions.fTexGeni ||
                 NULL == fFunctions.fVertexPointer) {
                 return false;
             }
         }
-        if (fExtensions.has("GL_NV_path_rendering")) {
+        if (false && fExtensions.has("GL_NV_path_rendering")) {
             if (NULL == fFunctions.fPathCommands ||
                 NULL == fFunctions.fPathCoords ||
                 NULL == fFunctions.fPathSubCommands ||
                 NULL == fFunctions.fPathSubCoords ||
                 NULL == fFunctions.fPathString ||
                 NULL == fFunctions.fPathGlyphs ||
                 NULL == fFunctions.fPathGlyphRange ||
                 NULL == fFunctions.fWeightPaths ||
                 NULL == fFunctions.fCopyPath ||
                 NULL == fFunctions.fInterpolatePaths ||
@@ skipping 160 matching lines @@
         if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_object")) {
             if (NULL == fFunctions.fBindVertexArray ||
                 NULL == fFunctions.fDeleteVertexArrays ||
                 NULL == fFunctions.fGenVertexArrays) {
                 return false;
             }
         }
     }
     return true;
 }