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" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 case 7: | 57 case 7: |
58 return GPUTestConfig::kOsMacLion; | 58 return GPUTestConfig::kOsMacLion; |
59 case 8: | 59 case 8: |
60 return GPUTestConfig::kOsMacMountainLion; | 60 return GPUTestConfig::kOsMacMountainLion; |
61 case 9: | 61 case 9: |
62 return GPUTestConfig::kOsMacMavericks; | 62 return GPUTestConfig::kOsMacMavericks; |
63 case 10: | 63 case 10: |
64 return GPUTestConfig::kOsMacYosemite; | 64 return GPUTestConfig::kOsMacYosemite; |
65 case 11: | 65 case 11: |
66 return GPUTestConfig::kOsMacElCapitan; | 66 return GPUTestConfig::kOsMacElCapitan; |
| 67 case 12: |
| 68 return GPUTestConfig::kOsMacSierra; |
67 } | 69 } |
68 } | 70 } |
69 #elif defined(OS_ANDROID) | 71 #elif defined(OS_ANDROID) |
70 return GPUTestConfig::kOsAndroid; | 72 return GPUTestConfig::kOsAndroid; |
71 #endif | 73 #endif |
72 return GPUTestConfig::kOsUnknown; | 74 return GPUTestConfig::kOsUnknown; |
73 } | 75 } |
74 | 76 |
75 } // namespace anonymous | 77 } // namespace anonymous |
76 | 78 |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 case kOsWin7: | 184 case kOsWin7: |
183 case kOsWin8: | 185 case kOsWin8: |
184 case kOsWin10: | 186 case kOsWin10: |
185 case kOsMacLeopard: | 187 case kOsMacLeopard: |
186 case kOsMacSnowLeopard: | 188 case kOsMacSnowLeopard: |
187 case kOsMacLion: | 189 case kOsMacLion: |
188 case kOsMacMountainLion: | 190 case kOsMacMountainLion: |
189 case kOsMacMavericks: | 191 case kOsMacMavericks: |
190 case kOsMacYosemite: | 192 case kOsMacYosemite: |
191 case kOsMacElCapitan: | 193 case kOsMacElCapitan: |
| 194 case kOsMacSierra: |
192 case kOsLinux: | 195 case kOsLinux: |
193 case kOsChromeOS: | 196 case kOsChromeOS: |
194 case kOsAndroid: | 197 case kOsAndroid: |
195 break; | 198 break; |
196 default: | 199 default: |
197 return false; | 200 return false; |
198 } | 201 } |
199 if (validate_gpu_info_) { | 202 if (validate_gpu_info_) { |
200 if (gpu_vendor().size() != 1 || gpu_vendor()[0] == 0) | 203 if (gpu_vendor().size() != 1 || gpu_vendor()[0] == 0) |
201 return false; | 204 return false; |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. | 307 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. |
305 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { | 308 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { |
306 return true; | 309 return true; |
307 } | 310 } |
308 #endif | 311 #endif |
309 return false; | 312 return false; |
310 } | 313 } |
311 | 314 |
312 } // namespace gpu | 315 } // namespace gpu |
313 | 316 |
OLD | NEW |