| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_linux.h" | 5 #include "gpu/config/gpu_info_collector_linux.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) { | 184 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) { |
| 185 DCHECK(gpu_info); | 185 DCHECK(gpu_info); |
| 186 | 186 |
| 187 TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo"); | 187 TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo"); |
| 188 | 188 |
| 189 CollectInfoResult result = CollectGraphicsInfoGL(gpu_info); | 189 CollectInfoResult result = CollectGraphicsInfoGL(gpu_info); |
| 190 gpu_info->context_info_state = result; | 190 gpu_info->context_info_state = result; |
| 191 return result; | 191 return result; |
| 192 } | 192 } |
| 193 | 193 |
| 194 CollectInfoResult CollectGpuID(uint32_t* vendor_id, uint32_t* device_id) { | |
| 195 DCHECK(vendor_id && device_id); | |
| 196 *vendor_id = 0; | |
| 197 *device_id = 0; | |
| 198 | |
| 199 GPUInfo gpu_info; | |
| 200 CollectInfoResult result = CollectPCIVideoCardInfo(&gpu_info); | |
| 201 if (result == kCollectInfoSuccess) { | |
| 202 *vendor_id = gpu_info.gpu.vendor_id; | |
| 203 *device_id = gpu_info.gpu.device_id; | |
| 204 } | |
| 205 return result; | |
| 206 } | |
| 207 | |
| 208 CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) { | 194 CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) { |
| 209 DCHECK(gpu_info); | 195 DCHECK(gpu_info); |
| 210 | 196 |
| 211 CollectInfoResult result = CollectPCIVideoCardInfo(gpu_info); | 197 CollectInfoResult result = CollectPCIVideoCardInfo(gpu_info); |
| 212 | 198 |
| 213 std::string driver_version; | 199 std::string driver_version; |
| 214 switch (gpu_info->gpu.vendor_id) { | 200 switch (gpu_info->gpu.vendor_id) { |
| 215 case kVendorIDAMD: | 201 case kVendorIDAMD: |
| 216 driver_version = CollectDriverVersionAMDBrahma(); | 202 driver_version = CollectDriverVersionAMDBrahma(); |
| 217 if (!driver_version.empty()) { | 203 if (!driver_version.empty()) { |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 gpu_info->driver_version = driver_version; | 281 gpu_info->driver_version = driver_version; |
| 296 return kCollectInfoSuccess; | 282 return kCollectInfoSuccess; |
| 297 } | 283 } |
| 298 | 284 |
| 299 void MergeGPUInfo(GPUInfo* basic_gpu_info, | 285 void MergeGPUInfo(GPUInfo* basic_gpu_info, |
| 300 const GPUInfo& context_gpu_info) { | 286 const GPUInfo& context_gpu_info) { |
| 301 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 287 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
| 302 } | 288 } |
| 303 | 289 |
| 304 } // namespace gpu | 290 } // namespace gpu |
| OLD | NEW |