Add predfined configs for msaa4, nvpr4, nvpr4dit, and srgb that explictly use OpenGL rather than GL…

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 40 matching lines @@
 #endif
 }
 
 DEF_TEST(ParseConfigs_OutParam, reporter) {
     // Clears the out parameter.
     SkCommandLineFlags::StringArray config1 = make_string_array({"gpu"});
     SkCommandLineConfigArray configs;
     ParseConfigs(config1, &configs);
     REPORTER_ASSERT(reporter, configs.count() == 1);
     REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gpu"));
+
     SkCommandLineFlags::StringArray config2 = make_string_array({"8888"});
     ParseConfigs(config2, &configs);
     REPORTER_ASSERT(reporter, configs.count() == 1);
     REPORTER_ASSERT(reporter, configs[0]->getTag().equals("8888"));
+
+    SkCommandLineFlags::StringArray config3 = make_string_array({"gl"});
+    ParseConfigs(config3, &configs);
+    REPORTER_ASSERT(reporter, configs.count() == 1);
+    REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gl"));
 }
 
 DEF_TEST(ParseConfigs_DefaultConfigs, reporter) {
     // Parses all default configs and returns correct "tag".
 
     SkCommandLineFlags::StringArray config1 = make_string_array({
         "565", "8888", "debug", "gpu", "gpudebug", "gpudft", "gpunull", "msaa16", "msaa4",
         "nonrendering", "null", "nullgpu", "nvpr16", "nvpr4", "nvprdit16", "nvprdit4", "pdf",
         "pdf_poppler", "skp", "svg", "xps", "angle", "angle-gl", "commandbuffer", "mesa", "hwui",
-        "gpuf16", "gpusrgb"
+        "gpuf16", "gpusrgb", "gl", "glnvpr4", "glnvprdit4", "glsrgb", "glmsaa4"
     });
 
     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]));
         REPORTER_ASSERT(reporter, configs[i]->getViaParts().count() == 0);
     }
@@ skipping 50 matching lines @@
 #if SK_COMMAND_BUFFER
     REPORTER_ASSERT(reporter, configs[23]->asConfigGpu());
 #else
     REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu());
 #endif
 #if SK_MESA
     REPORTER_ASSERT(reporter, configs[24]->asConfigGpu());
 #else
     REPORTER_ASSERT(reporter, !configs[24]->asConfigGpu());
 #endif
+    REPORTER_ASSERT(reporter, configs[28]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[29]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getSamples() == 4);
+    REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu());

[egdaniel, 2016/04/04 19:09:19]

currently in ToT there is a bug with the current indices (never got updated from
a change). Hal is landed a fix for them, and then you will need to rebase and
fix your indices.

+    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getSamples() == 4);
+    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getUseDIText());
+    REPORTER_ASSERT(reporter, configs[31]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getColorType()
+                    == kN32_SkColorType);
+    REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getProfileType()
+                    == kSRGB_SkColorProfileType);
+    REPORTER_ASSERT(reporter, configs[32]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getSamples() == 4);
 #endif
 }
 
 DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) {
     SkCommandLineFlags::StringArray config1 = make_string_array({
         "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)"
+        "gpu(api=gles)",
+        "gpu(api=gl)"
     });
 
     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() ==
@@ skipping 30 matching lines @@
     REPORTER_ASSERT(reporter, configs[5]->asConfigGpu()->getContextType() ==
                     GrContextFactory::kNativeGL_ContextType);
     REPORTER_ASSERT(reporter, !configs[5]->asConfigGpu()->getUseNVPR());
     REPORTER_ASSERT(reporter, !configs[5]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[5]->asConfigGpu()->getSamples() == 0);
     REPORTER_ASSERT(reporter, configs[6]->asConfigGpu()->getContextType() ==
                     GrContextFactory::kGLES_ContextType);
     REPORTER_ASSERT(reporter, !configs[6]->asConfigGpu()->getUseNVPR());
     REPORTER_ASSERT(reporter, !configs[6]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[6]->asConfigGpu()->getSamples() == 0);
+    REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getContextType() ==
+                    GrContextFactory::kGL_ContextType);
+    REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseDIText());
+    REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getSamples() == 0);
 #endif
 }
 
 DEF_TEST(ParseConfigs_ExtendedGpuConfigsIncorrect, reporter) {
     SkCommandLineFlags::StringArray config1 = make_string_array({
         "gpu(nvpr=1)", // Number as bool.
         "gpu(api=gl,)", // Trailing in comma.
         "gpu(api=angle-glu)", // Unknown api.
         "gpu(api=,samples=0)", // Empty api.
         "gpu(samples=true)", // Value true as a number.
@@ skipping 106 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
 }