OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "gpu/config/gpu_test_config.h" | 5 #include "gpu/config/gpu_test_config.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/sys_info.h" | 11 #include "base/sys_info.h" |
12 #include "gpu/config/gpu_info.h" | 12 #include "gpu/config/gpu_info.h" |
13 #include "gpu/config/gpu_info_collector.h" | 13 #include "gpu/config/gpu_info_collector.h" |
14 #include "gpu/config/gpu_test_expectations_parser.h" | 14 #include "gpu/config/gpu_test_expectations_parser.h" |
15 | 15 |
16 #if defined(OS_MACOSX) | 16 #if defined(OS_MACOSX) |
17 #include "base/mac/mac_util.h" | 17 #include "base/mac/mac_util.h" |
tapted
2016/04/25 21:25:46
remove?
Nico
2016/04/26 14:30:44
Done.
| |
18 #elif defined(OS_WIN) | 18 #elif defined(OS_WIN) |
19 #include "base/win/windows_version.h" | 19 #include "base/win/windows_version.h" |
20 #endif | 20 #endif |
21 | 21 |
22 namespace gpu { | 22 namespace gpu { |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 GPUTestConfig::OS GetCurrentOS() { | 26 GPUTestConfig::OS GetCurrentOS() { |
27 #if defined(OS_CHROMEOS) | 27 #if defined(OS_CHROMEOS) |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
295 return false; | 295 return false; |
296 for (size_t i = 0 ; i < configs.size(); ++i) { | 296 for (size_t i = 0 ; i < configs.size(); ++i) { |
297 if (my_config.Matches(configs[i])) | 297 if (my_config.Matches(configs[i])) |
298 return true; | 298 return true; |
299 } | 299 } |
300 return false; | 300 return false; |
301 } | 301 } |
302 | 302 |
303 // static | 303 // static |
304 bool GPUTestBotConfig::GpuBlacklistedOnBot() { | 304 bool GPUTestBotConfig::GpuBlacklistedOnBot() { |
305 #if defined(OS_MACOSX) | 305 #if defined(OS_WIN) |
306 // Blacklist rule #81 disables all Gpu acceleration on Mac < 10.8 bots. | |
307 if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) { | |
308 return true; | |
309 } | |
310 #elif defined(OS_WIN) | |
311 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. | 306 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. |
312 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { | 307 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { |
313 return true; | 308 return true; |
314 } | 309 } |
315 #endif | 310 #endif |
316 return false; | 311 return false; |
317 } | 312 } |
318 | 313 |
319 } // namespace gpu | 314 } // namespace gpu |
320 | 315 |
OLD | NEW |