| 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_info_collector.h" | 5 #include "gpu/config/gpu_info_collector.h" |
| 6 | 6 |
| 7 // This has to be included before windows.h. | 7 // This has to be included before windows.h. |
| 8 #include "third_party/re2/src/re2/re2.h" | 8 #include "third_party/re2/src/re2/re2.h" |
| 9 | 9 |
| 10 #include <windows.h> | 10 #include <windows.h> |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 if (id.length() < 21) | 98 if (id.length() < 21) |
| 99 return; | 99 return; |
| 100 base::string16 vendor_id_string = id.substr(8, 4); | 100 base::string16 vendor_id_string = id.substr(8, 4); |
| 101 base::string16 device_id_string = id.substr(17, 4); | 101 base::string16 device_id_string = id.substr(17, 4); |
| 102 int vendor = 0; | 102 int vendor = 0; |
| 103 int device = 0; | 103 int device = 0; |
| 104 base::HexStringToInt(base::UTF16ToASCII(vendor_id_string), &vendor); | 104 base::HexStringToInt(base::UTF16ToASCII(vendor_id_string), &vendor); |
| 105 base::HexStringToInt(base::UTF16ToASCII(device_id_string), &device); | 105 base::HexStringToInt(base::UTF16ToASCII(device_id_string), &device); |
| 106 *vendor_id = vendor; | 106 *vendor_id = vendor; |
| 107 *device_id = device; | 107 *device_id = device; |
| 108 |
| 109 ParseTestingIds(vendor_id, device_id); |
| 108 } | 110 } |
| 109 | 111 |
| 110 } // namespace anonymous | 112 } // namespace anonymous |
| 111 | 113 |
| 112 #if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD) | 114 #if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD) |
| 113 // This function has a real implementation for official builds that can | 115 // This function has a real implementation for official builds that can |
| 114 // be found in src/third_party/amd. | 116 // be found in src/third_party/amd. |
| 115 void GetAMDVideocardInfo(GPUInfo* gpu_info); | 117 void GetAMDVideocardInfo(GPUInfo* gpu_info); |
| 116 #else | 118 #else |
| 117 void GetAMDVideocardInfo(GPUInfo* gpu_info) { | 119 void GetAMDVideocardInfo(GPUInfo* gpu_info) { |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 495 } | 497 } |
| 496 | 498 |
| 497 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 499 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
| 498 | 500 |
| 499 basic_gpu_info->dx_diagnostics_info_state = | 501 basic_gpu_info->dx_diagnostics_info_state = |
| 500 context_gpu_info.dx_diagnostics_info_state; | 502 context_gpu_info.dx_diagnostics_info_state; |
| 501 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; | 503 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; |
| 502 } | 504 } |
| 503 | 505 |
| 504 } // namespace gpu | 506 } // namespace gpu |
| OLD | NEW |