Chromium Code Reviews Chromium Code Reviews
Issue 1246203003:
Add Windows 10 support to GPU config parser. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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" |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 base::SysInfo::OperatingSystemVersionNumbers( | 32 base::SysInfo::OperatingSystemVersionNumbers( |
| 33 &major_version, &minor_version, &bugfix_version); | 33 &major_version, &minor_version, &bugfix_version); |
| 34 if (major_version == 5) | 34 if (major_version == 5) |
| 35 return GPUTestConfig::kOsWinXP; | 35 return GPUTestConfig::kOsWinXP; |
| 36 if (major_version == 6 && minor_version == 0) | 36 if (major_version == 6 && minor_version == 0) |
| 37 return GPUTestConfig::kOsWinVista; | 37 return GPUTestConfig::kOsWinVista; |
| 38 if (major_version == 6 && minor_version == 1) | 38 if (major_version == 6 && minor_version == 1) |
| 39 return GPUTestConfig::kOsWin7; | 39 return GPUTestConfig::kOsWin7; |
| 40 if (major_version == 6 && (minor_version == 2 || minor_version == 3)) | 40 if (major_version == 6 && (minor_version == 2 || minor_version == 3)) |
| 41 return GPUTestConfig::kOsWin8; | 41 return GPUTestConfig::kOsWin8; |
| 42 if (major_version == 10) | |
|
Will Harris
2015/07/22 01:12:35
this won't catch some early builds of Win10 which
| |
| 43 return GPUTestConfig::kOsWin10; | |
| 42 #elif defined(OS_MACOSX) | 44 #elif defined(OS_MACOSX) |
| 43 int32 major_version = 0; | 45 int32 major_version = 0; |
| 44 int32 minor_version = 0; | 46 int32 minor_version = 0; |
| 45 int32 bugfix_version = 0; | 47 int32 bugfix_version = 0; |
| 46 base::SysInfo::OperatingSystemVersionNumbers( | 48 base::SysInfo::OperatingSystemVersionNumbers( |
| 47 &major_version, &minor_version, &bugfix_version); | 49 &major_version, &minor_version, &bugfix_version); |
| 48 if (major_version == 10) { | 50 if (major_version == 10) { |
| 49 switch (minor_version) { | 51 switch (minor_version) { |
| 50 case 5: | 52 case 5: |
| 51 return GPUTestConfig::kOsMacLeopard; | 53 return GPUTestConfig::kOsMacLeopard; |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 set_gpu_device_id(gpu_info.gpu.device_id); | 164 set_gpu_device_id(gpu_info.gpu.device_id); |
| 163 return true; | 165 return true; |
| 164 } | 166 } |
| 165 | 167 |
| 166 bool GPUTestBotConfig::IsValid() const { | 168 bool GPUTestBotConfig::IsValid() const { |
| 167 switch (os()) { | 169 switch (os()) { |
| 168 case kOsWinXP: | 170 case kOsWinXP: |
| 169 case kOsWinVista: | 171 case kOsWinVista: |
| 170 case kOsWin7: | 172 case kOsWin7: |
| 171 case kOsWin8: | 173 case kOsWin8: |
| 174 case kOsWin10: | |
| 172 case kOsMacLeopard: | 175 case kOsMacLeopard: |
| 173 case kOsMacSnowLeopard: | 176 case kOsMacSnowLeopard: |
| 174 case kOsMacLion: | 177 case kOsMacLion: |
| 175 case kOsMacMountainLion: | 178 case kOsMacMountainLion: |
| 176 case kOsMacMavericks: | 179 case kOsMacMavericks: |
| 177 case kOsMacYosemite: | 180 case kOsMacYosemite: |
| 178 case kOsLinux: | 181 case kOsLinux: |
| 179 case kOsChromeOS: | 182 case kOsChromeOS: |
| 180 case kOsAndroid: | 183 case kOsAndroid: |
| 181 break; | 184 break; |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 293 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. | 296 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. |
| 294 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { | 297 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { |
| 295 return true; | 298 return true; |
| 296 } | 299 } |
| 297 #endif | 300 #endif |
| 298 return false; | 301 return false; |
| 299 } | 302 } |
| 300 | 303 |
| 301 } // namespace gpu | 304 } // namespace gpu |
| 302 | 305 |
| OLD | NEW |
