Use device-independent text for nvprmsaa4/16 in nanobench and dm

tests/TestConfigParsing.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommonFlagsConfig.h"
 #include "Test.h"
 #include <initializer_list>
@@ skipping 73 matching lines @@
     REPORTER_ASSERT(reporter, configs[4]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[5]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[6]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getSamples() == 16);
     REPORTER_ASSERT(reporter, configs[8]->asConfigGpu()->getSamples() == 4);
     REPORTER_ASSERT(reporter, !configs[9]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[10]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[11]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getSamples() == 16);
     REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getSamples() == 4);
     REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, !configs[14]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[15]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[16]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[17]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[18]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu());
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
     REPORTER_ASSERT(reporter, configs[19]->asConfigGpu());
 #else
@@ skipping 12 matching lines @@
 #if SK_MESA
     REPORTER_ASSERT(reporter, configs[22]->asConfigGpu());
 #else
     REPORTER_ASSERT(reporter, !configs[22]->asConfigGpu());
 #endif
 #endif
 }
 
 DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) {
     SkCommandLineFlags::StringArray config1 = make_string_array({
-        "gpu(nvpr=true,dit=true)",
+        "gpu(nvpr=true,dit=false)",
         "gpu(api=angle)",
         "gpu(api=angle-gl)",
         "gpu(api=mesa,samples=77)",
         "gpu(dit=true,api=commandbuffer)",
         "gpu()",
         "gpu(api=gles)"
     });
 
     SkCommandLineConfigArray configs;
     ParseConfigs(config1, &configs);
     REPORTER_ASSERT(reporter, configs.count() == config1.count());
     for (int i = 0; i < config1.count(); ++i) {
         REPORTER_ASSERT(reporter, configs[i]->getTag().equals(config1[i]));
     }
 #if SK_SUPPORT_GPU
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getContextType() ==
                     GrContextFactory::kNative_GLContextType);
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseNVPR());
-    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseDIText());
+    REPORTER_ASSERT(reporter, !configs[0]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getSamples() == 0);
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
     REPORTER_ASSERT(reporter, configs[1]->asConfigGpu()->getContextType() ==
                     GrContextFactory::kANGLE_GLContextType);
 #else
     REPORTER_ASSERT(reporter, !configs[1]->asConfigGpu());
 #endif
     REPORTER_ASSERT(reporter, configs[2]->asConfigGpu()->getContextType() ==
                     GrContextFactory::kANGLE_GL_GLContextType);
@@ skipping 147 matching lines @@
             REPORTER_ASSERT(reporter,
                             configs[i]->getViaParts()[j].equals(expectedConfigs[i].vias[j]));
         }
     }
 #if SK_SUPPORT_GPU
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[1]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[2]->asConfigGpu());
 #endif
 }