Vulkan: Add the Vulkan API to gpu_test_expectations.

src/tests/third_party/gpu_test_expectations/gpu_test_config.cc

@@ -163,7 +163,7 @@ void GPUTestConfig::set_build_type(int32_t build_type) {
 }
 
 void GPUTestConfig::set_api(int32_t api) {
-  DCHECK_EQ(0, api & ~(kAPID3D9 | kAPID3D11 | kAPIGLDesktop | kAPIGLES));
+  DCHECK_EQ(0, api & ~(kAPID3D9 | kAPID3D11 | kAPIGLDesktop | kAPIGLES | kAPIVulkan));
   api_ = api;
 }
 

src/tests/third_party/gpu_test_expectations/gpu_test_config.h

@@ -55,6 +55,7 @@ class GPU_EXPORT GPUTestConfig {
     kAPID3D11 = 1 << 1,
     kAPIGLDesktop = 1 << 2,
     kAPIGLES = 1 << 3,
+    kAPIVulkan = 1 << 4,
   };
 
   GPUTestConfig();

src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc

@@ -92,6 +92,7 @@ enum Token {
   kConfigD3D11,
   kConfigGLDesktop,
   kConfigGLES,
+  kConfigVulkan,
   // expectation
   kExpectationPass,
   kExpectationFail,
@@ -145,6 +146,7 @@ const TokenInfo kTokenData[] = {
     {"d3d11", GPUTestConfig::kAPID3D11},
     {"opengl", GPUTestConfig::kAPIGLDesktop},
     {"gles", GPUTestConfig::kAPIGLES},
+    {"vulkan", GPUTestConfig::kAPIVulkan},
     {"pass", GPUTestExpectationsParser::kGpuTestPass},
     {"fail", GPUTestExpectationsParser::kGpuTestFail},
     {"flaky", GPUTestExpectationsParser::kGpuTestFlaky},
@@ -309,6 +311,7 @@ bool GPUTestExpectationsParser::ParseConfig(
       case kConfigD3D11:
       case kConfigGLDesktop:
       case kConfigGLES:
+      case kConfigVulkan:
       case kConfigGPUDeviceID:
         if (token == kConfigGPUDeviceID) {
           if (!UpdateTestConfig(config, tokens[i], 0))
@@ -370,6 +373,7 @@ bool GPUTestExpectationsParser::ParseLine(
       case kConfigD3D11:
       case kConfigGLDesktop:
       case kConfigGLES:
+      case kConfigVulkan:
       case kConfigGPUDeviceID:
         // MODIFIERS, could be in any order, need at least one.
         if (stage != kLineParserConfigs && stage != kLineParserBugID) {
@@ -523,6 +527,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(GPUTestConfig* config,
     case kConfigD3D11:
     case kConfigGLDesktop:
     case kConfigGLES:
+    case kConfigVulkan:
       if ((config->api() & kTokenData[token].flag) != 0) {
         PushErrorMessage(kErrorMessage[kErrorEntryWithAPIConflicts],
                          line_number);