Commit b9cb7f60 by Corentin Wallez Committed by Commit Bot

Update gpu_test_expectations

This adds support for macOS 10.13 "High Sierra" BUG=chromium:774309 Change-Id: I9b5b13750608f703dd0a3e0afeb1e314b437b8cc Reviewed-on: https://chromium-review.googlesource.com/721520 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 8a9e0fc2
......@@ -134,7 +134,6 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
bool in_process_gpu;
bool passthrough_cmd_decoder;
bool supports_overlays;
bool hdr;
bool can_support_threaded_texture_mailbox;
CollectInfoResult basic_info_state;
CollectInfoResult context_info_state;
......@@ -195,7 +194,6 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
enumerator->AddBool("inProcessGpu", in_process_gpu);
enumerator->AddBool("passthroughCmdDecoder", passthrough_cmd_decoder);
enumerator->AddBool("supportsOverlays", supports_overlays);
enumerator->AddBool("hdr", hdr);
enumerator->AddBool("canSupportThreadedTextureMailbox",
can_support_threaded_texture_mailbox);
enumerator->AddInt("basicInfoState", basic_info_state);
......
......@@ -61,7 +61,8 @@ enum VideoCodecProfile {
DOLBYVISION_PROFILE4,
DOLBYVISION_PROFILE5,
DOLBYVISION_PROFILE7,
VIDEO_CODEC_PROFILE_MAX = DOLBYVISION_PROFILE7,
THEORAPROFILE_ANY,
VIDEO_CODEC_PROFILE_MAX = THEORAPROFILE_ANY,
};
// Specification of a decoding profile supported by a hardware decoder.
......@@ -218,9 +219,6 @@ struct GPU_EXPORT GPUInfo {
// True if the current set of outputs supports overlays.
bool supports_overlays = false;
// True if the current set of outputs supports HDR.
bool hdr = false;
// True only on android when extensions for threaded mailbox sharing are
// present. Threaded mailbox sharing is used on Android only, so this check
// is only implemented on Android.
......
......@@ -98,6 +98,8 @@ GPUTestConfig::OS GetCurrentOS() {
return GPUTestConfig::kOsMacElCapitan;
case 12:
return GPUTestConfig::kOsMacSierra;
case 13:
return GPUTestConfig::kOsMacHighSierra;
}
}
#elif defined(OS_ANDROID)
......@@ -244,6 +246,7 @@ bool GPUTestBotConfig::IsValid() const {
case kOsMacYosemite:
case kOsMacElCapitan:
case kOsMacSierra:
case kOsMacHighSierra:
case kOsLinux:
case kOsChromeOS:
case kOsAndroid:
......
......@@ -32,13 +32,14 @@ class GPU_EXPORT GPUTestConfig {
kOsMacYosemite = 1 << 9,
kOsMacElCapitan = 1 << 10,
kOsMacSierra = 1 << 11,
kOsMacHighSierra = 1 << 12,
kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion |
kOsMacMountainLion | kOsMacMavericks | kOsMacYosemite |
kOsMacElCapitan | kOsMacSierra,
kOsLinux = 1 << 12,
kOsChromeOS = 1 << 13,
kOsAndroid = 1 << 14,
kOsWin10 = 1 << 15,
kOsMacElCapitan | kOsMacSierra | kOsMacHighSierra,
kOsLinux = 1 << 13,
kOsChromeOS = 1 << 14,
kOsAndroid = 1 << 15,
kOsWin10 = 1 << 16,
kOsWin = kOsWinXP | kOsWinVista | kOsWin7 | kOsWin8 | kOsWin10,
};
......
......@@ -74,6 +74,7 @@ enum Token {
kConfigMacYosemite,
kConfigMacElCapitan,
kConfigMacSierra,
kConfigMacHighSierra,
kConfigMac,
kConfigLinux,
kConfigChromeOS,
......@@ -129,6 +130,7 @@ const TokenInfo kTokenData[] = {
{"yosemite", GPUTestConfig::kOsMacYosemite},
{"elcapitan", GPUTestConfig::kOsMacElCapitan},
{"sierra", GPUTestConfig::kOsMacSierra},
{"highsierra", GPUTestConfig::kOsMacHighSierra},
{"mac", GPUTestConfig::kOsMac},
{"linux", GPUTestConfig::kOsLinux},
{"chromeos", GPUTestConfig::kOsChromeOS},
......@@ -292,6 +294,7 @@ bool GPUTestExpectationsParser::ParseConfig(
case kConfigMacYosemite:
case kConfigMacElCapitan:
case kConfigMacSierra:
case kConfigMacHighSierra:
case kConfigMac:
case kConfigLinux:
case kConfigChromeOS:
......@@ -352,6 +355,7 @@ bool GPUTestExpectationsParser::ParseLine(
case kConfigMacYosemite:
case kConfigMacElCapitan:
case kConfigMacSierra:
case kConfigMacHighSierra:
case kConfigMac:
case kConfigLinux:
case kConfigChromeOS:
......@@ -475,6 +479,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(GPUTestConfig* config,
case kConfigMacYosemite:
case kConfigMacElCapitan:
case kConfigMacSierra:
case kConfigMacHighSierra:
case kConfigMac:
case kConfigLinux:
case kConfigChromeOS:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment