| 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 "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/sys_info.h" | 8 #include "base/sys_info.h" |
| 9 #include "gpu/config/gpu_info.h" | 9 #include "gpu/config/gpu_info.h" |
| 10 #include "gpu/config/gpu_info_collector.h" | 10 #include "gpu/config/gpu_info_collector.h" |
| 11 #include "gpu/config/gpu_test_expectations_parser.h" | 11 #include "gpu/config/gpu_test_expectations_parser.h" |
| 12 | 12 |
| 13 #if defined(OS_MACOSX) | 13 #if defined(OS_MACOSX) |
| 14 #include "base/mac/mac_util.h" | 14 #include "base/mac/mac_util.h" |
| 15 #elif defined(OS_WIN) |
| 16 #include "base/win/windows_version.h" |
| 15 #endif | 17 #endif |
| 16 | 18 |
| 17 namespace gpu { | 19 namespace gpu { |
| 18 | 20 |
| 19 namespace { | 21 namespace { |
| 20 | 22 |
| 21 GPUTestConfig::OS GetCurrentOS() { | 23 GPUTestConfig::OS GetCurrentOS() { |
| 22 #if defined(OS_CHROMEOS) | 24 #if defined(OS_CHROMEOS) |
| 23 return GPUTestConfig::kOsChromeOS; | 25 return GPUTestConfig::kOsChromeOS; |
| 24 #elif defined(OS_LINUX) || defined(OS_OPENBSD) | 26 #elif defined(OS_LINUX) || defined(OS_OPENBSD) |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 return false; | 274 return false; |
| 273 } | 275 } |
| 274 | 276 |
| 275 // static | 277 // static |
| 276 bool GPUTestBotConfig::GpuBlacklistedOnBot() { | 278 bool GPUTestBotConfig::GpuBlacklistedOnBot() { |
| 277 #if defined(OS_MACOSX) | 279 #if defined(OS_MACOSX) |
| 278 // Blacklist rule #81 disables all Gpu acceleration on Mac < 10.8 bots. | 280 // Blacklist rule #81 disables all Gpu acceleration on Mac < 10.8 bots. |
| 279 if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) { | 281 if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) { |
| 280 return true; | 282 return true; |
| 281 } | 283 } |
| 284 #elif defined(OS_WIN) |
| 285 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. |
| 286 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { |
| 287 return true; |
| 288 } |
| 282 #endif | 289 #endif |
| 283 // TODO(ccameron): This should be true on Windows XP as well. | |
| 284 return false; | 290 return false; |
| 285 } | 291 } |
| 286 | 292 |
| 287 } // namespace gpu | 293 } // namespace gpu |
| 288 | 294 |
| OLD | NEW |