Simplify nvpr text

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 "OverView.h"
@@ skipping 68 matching lines @@
 #ifdef  PIPE_NET
 #include "SkSockets.h"
 SkTCPServer gServer;
 #endif
 
 #if SK_COMMAND_BUFFER
 #define DEFAULT_TO_COMMAND_BUFFER 1
 #elif SK_ANGLE
 //#define DEFAULT_TO_ANGLE 1
 #else
-#define DEFAULT_TO_GPU 0 // if 1 default rendering is on GPU
+#define DEFAULT_TO_GPU 1 // if 1 default rendering is on GPU
 #endif
 
 #define ANIMATING_EVENTTYPE "nextSample"
 #define ANIMATING_DELAY     250
 
 #ifdef SK_DEBUG
     #define FPS_REPEAT_MULTIPLIER   1
 #else
     #define FPS_REPEAT_MULTIPLIER   10
 #endif
@@ skipping 136 matching lines @@
                 glInterface.reset(GrGLCreateCommandBufferInterface());
                 break;
 #endif // SK_COMMAND_BUFFER
             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());
+        fCurIntf = SkRef/*GrGLInterfaceRemoveNVPR*/(glInterface.get());

[Mark Kilgard, 2015/10/01 17:33:24]

would it be good to have a command line to SampleApp that decided this?

could there even be a keyboard key to toggle this?

I think yes

[Chris Dalton, 2015/10/03 16:39:20]

Oops, that was an accidental hack that found its way into this patch. Updating
SampleApp to support nvpr would be nice, but probably something for a different
CL.

 
         SkASSERT(nullptr == fCurContext);
         fCurContext = GrContext::Create(kOpenGL_GrBackend, (GrBackendContext) fCurIntf);
 
         if (nullptr == fCurContext || nullptr == fCurIntf) {
             // We need some context and interface to see results
             SkSafeUnref(fCurContext);
             SkSafeUnref(fCurIntf);
             fCurContext = nullptr;
             fCurIntf = nullptr;
@@ skipping 2134 matching lines @@
 #ifdef SK_BUILD_FOR_MAC
     setenv("ANDROID_ROOT", "/android/device/data", 0);
 #endif
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 void application_term() {
     SkEvent::Term();
 }