commit a15cedbc26fee1ba23465aaa0dc46dd0e69996cc
author Brian Osman <brianosman@google.com> Wed May 30 15:36:38 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 30 20:10:38 2018 +0000
tree e3988d6cef8c06f5cafb7594814fcd83d8bfe5d1
parent 00f8866a321332f07520e3c12963aa1332bb7e82

Clean up GPU configs in DM

Remove wide and narrow, adjust remaining configs to match the new CPU
configs, and fix several formatting problems in the help output.

Bug: skia:
Change-Id: I0946ac407d88a922e7f62220e7f4b39ae8c2e469
Reviewed-on: https://skia-review.googlesource.com/131000
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tests/TestConfigParsing.cpp

diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp
index fae8cd8..df02815 100644
--- a/tests/TestConfigParsing.cpp
+++ b/tests/TestConfigParsing.cpp
@@ -105,8 +105,6 @@
         "glsrgb",
         "glmsaa4",
         "vk",
-        "glwide",
-        "glnarrow",
         "glnostencils",
         "mock",
         "mtl",
@@ -176,39 +174,28 @@
 #ifdef SK_VULKAN
     REPORTER_ASSERT(reporter, configs[28]->asConfigGpu());
 #endif
-    REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType);
-    REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getColorSpace());
-    REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getColorSpace()->gammaIsLinear());
-    const SkMatrix44* config41XYZ = configs[29]->asConfigGpu()->getColorSpace()->toXYZD50();
-    SkASSERT(config41XYZ);
-    REPORTER_ASSERT(reporter, *config41XYZ != *srgbXYZ);
-    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType);
-    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorSpace());
-    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorSpace()->gammaIsLinear());
-    REPORTER_ASSERT(reporter, *configs[30]->asConfigGpu()->getColorSpace()->toXYZD50() !=
-                    *srgbColorSpace->toXYZD50());
-    REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getContextType() ==
+    REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getContextType() ==
                               GrContextFactory::kGL_ContextType);
-    REPORTER_ASSERT(reporter, SkToBool(configs[31]->asConfigGpu()->getContextOverrides() &
+    REPORTER_ASSERT(reporter, SkToBool(configs[29]->asConfigGpu()->getContextOverrides() &
                               SkCommandLineConfigGpu::ContextOverrides::kAvoidStencilBuffers));
-    REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getContextType() ==
+    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getContextType() ==
                               GrContextFactory::kMock_ContextType);
 
-    REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getContextType() ==
+    REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getContextType() ==
                               GrContextFactory::kGL_ContextType);
-    REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getColorType() == kARGB_4444_SkColorType);
-    REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getAlphaType() == kPremul_SkAlphaType);
-    REPORTER_ASSERT(reporter, configs[35]->asConfigGpu()->getContextType() ==
+    REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getColorType() == kARGB_4444_SkColorType);
+    REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getAlphaType() == kPremul_SkAlphaType);
+    REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getContextType() ==
                               GrContextFactory::kGL_ContextType);
-    REPORTER_ASSERT(reporter, configs[35]->asConfigGpu()->getColorType() == kRGB_565_SkColorType);
-    REPORTER_ASSERT(reporter, configs[35]->asConfigGpu()->getAlphaType() == kOpaque_SkAlphaType);
-    REPORTER_ASSERT(reporter, configs[36]->asConfigGpu());
-    REPORTER_ASSERT(reporter, configs[36]->asConfigGpu()->getTestThreading());
-    REPORTER_ASSERT(reporter, configs[37]->asConfigGpu());
-    REPORTER_ASSERT(reporter, configs[37]->asConfigGpu()->getColorType() ==
+    REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getColorType() == kRGB_565_SkColorType);
+    REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getAlphaType() == kOpaque_SkAlphaType);
+    REPORTER_ASSERT(reporter, configs[34]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getTestThreading());
+    REPORTER_ASSERT(reporter, configs[35]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[35]->asConfigGpu()->getColorType() ==
                               kRGBA_1010102_SkColorType);
-    REPORTER_ASSERT(reporter, configs[38]->asConfigGpu());
-    REPORTER_ASSERT(reporter, configs[38]->asConfigGpu()->getSurfType() ==
+    REPORTER_ASSERT(reporter, configs[36]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[36]->asConfigGpu()->getSurfType() ==
                                       SkCommandLineConfigGpu::SurfType::kBackendRenderTarget);
 #endif
 }