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

samplecode/SampleApp.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 "SampleApp.h"
 
 #include "SkData.h"
 #include "SkCanvas.h"
@@ skipping 192 matching lines @@
         }
         AttachmentInfo attachmentInfo;
         bool result = win->attach(fBackend, msaaSampleCount, &attachmentInfo);
         if (!result) {
             SkDebugf("Failed to initialize GL");
             return;
         }
         fMSAASampleCount = msaaSampleCount;
 
         SkASSERT(NULL == fCurIntf);
-        SkAutoTUnref<const GrGLInterface> glInterface;
         switch (win->getDeviceType()) {
             case kRaster_DeviceType:
                 // fallthrough
             case kPicture_DeviceType:
                 // fallthrough
             case kGPU_DeviceType:
                 // all these guys use the native interface
-                glInterface.reset(GrGLCreateNativeInterface());
+                fCurIntf = GrGLCreateNativeInterface();
                 break;
 #if SK_ANGLE
             case kANGLE_DeviceType:
-                glInterface.reset(GrGLCreateANGLEInterface());
+                fCurIntf = GrGLCreateANGLEInterface();
                 break;
 #endif // SK_ANGLE
             case kNullGPU_DeviceType:
-                glInterface.reset(GrGLCreateNullInterface());
+                fCurIntf = GrGLCreateNullInterface();
                 break;
             default:
                 SkASSERT(false);
                 break;
         }
 
-        // Currently SampleApp does not use NVPR. TODO: Provide an NVPR device type that is skipped
-        // when the driver doesn't support NVPR.
-        fCurIntf = GrGLInterfaceRemoveNVPR(glInterface.get());
-
         SkASSERT(NULL == fCurContext);
         fCurContext = GrContext::Create(kOpenGL_GrBackend, (GrBackendContext) fCurIntf);
 
         if (NULL == fCurContext || NULL == fCurIntf) {
             // We need some context and interface to see results
             SkSafeUnref(fCurContext);
             SkSafeUnref(fCurIntf);
-            fCurContext = NULL;
-            fCurIntf = NULL;
             SkDebugf("Failed to setup 3D");
 
             win->detach();
         }
 #endif // SK_SUPPORT_GPU
         // call windowSizeChanged to create the render target
         this->windowSizeChanged(win);
     }
 
     virtual void tearDownBackend(SampleWindow *win) {
@@ skipping 2351 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }