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

src/gpu/gl/win/SkNativeGLContext_win.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/SkNativeGLContext.h"
 #include "SkWGL.h"
@@ skipping 68 matching lines @@
         SkDebugf("Could not create window.\n");
         return NULL;
     }
 
     if (!(fDeviceContext = GetDC(fWindow))) {
         SkDebugf("Could not get device context.\n");
         this->destroyGLContext();
         return NULL;
     }
 
-    // Requesting a Core profile would bar us from using NVPR. So we pass false.
-    if (!(fGlRenderContext = SkCreateWGLContext(fDeviceContext, 0, false))) {
+    // We don't want the core profile when using NV path rendering (since
+    // NV path rendering relies on fixed function calls)
+    if (!(fGlRenderContext = SkCreateWGLContext(fDeviceContext, 0,
+                                                !GR_GL_USE_NV_PATH_RENDERING))) {
         SkDebugf("Could not create rendering context.\n");
         this->destroyGLContext();
         return NULL;
     }
 
     if (!(wglMakeCurrent(fDeviceContext, fGlRenderContext))) {
         SkDebugf("Could not set the context.\n");
         this->destroyGLContext();
         return NULL;
     }
@@ skipping 11 matching lines @@
     if (!wglMakeCurrent(fDeviceContext, fGlRenderContext)) {
         SkDebugf("Could not create rendering context.\n");
     }
 }
 
 void SkNativeGLContext::swapBuffers() const {
     if (!SwapBuffers(fDeviceContext)) {
         SkDebugf("Could not complete SwapBuffers.\n");
     }
 }