Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: gpu/config/gpu_info_collector.cc

Issue 2725873007: gpu/config: Use angle::GetSystemInfo on Linux (Closed)
Patch Set: "Fix" gn check Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gpu/config/gpu_info_collector.h ('k') | gpu/config/gpu_info_collector_linux.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/metrics/histogram_macros.h" 15 #include "base/metrics/histogram_macros.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/string_piece.h" 17 #include "base/strings/string_piece.h"
18 #include "base/strings/string_split.h" 18 #include "base/strings/string_split.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/trace_event/trace_event.h" 20 #include "base/trace_event/trace_event.h"
21 #include "gpu/config/gpu_switches.h" 21 #include "gpu/config/gpu_switches.h"
22 #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck
22 #include "ui/gl/gl_bindings.h" 23 #include "ui/gl/gl_bindings.h"
23 #include "ui/gl/gl_context.h" 24 #include "ui/gl/gl_context.h"
24 #include "ui/gl/gl_implementation.h" 25 #include "ui/gl/gl_implementation.h"
25 #include "ui/gl/gl_surface.h" 26 #include "ui/gl/gl_surface.h"
26 #include "ui/gl/gl_version_info.h" 27 #include "ui/gl/gl_version_info.h"
27 #include "ui/gl/init/gl_factory.h" 28 #include "ui/gl/init/gl_factory.h"
28 29
29 #if defined(USE_X11) && !defined(OS_CHROMEOS) 30 #if defined(USE_X11) && !defined(OS_CHROMEOS)
30 #include "ui/gl/gl_visual_picker_glx.h" 31 #include "ui/gl/gl_visual_picker_glx.h"
31 #endif 32 #endif
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 return; 298 return;
298 } 299 }
299 for (size_t ii = 0; ii < gpu_info->secondary_gpus.size(); ++ii) { 300 for (size_t ii = 0; ii < gpu_info->secondary_gpus.size(); ++ii) {
300 if (active_vendor_id == gpu_info->secondary_gpus[ii].vendor_id) { 301 if (active_vendor_id == gpu_info->secondary_gpus[ii].vendor_id) {
301 gpu_info->secondary_gpus[ii].active = true; 302 gpu_info->secondary_gpus[ii].active = true;
302 return; 303 return;
303 } 304 }
304 } 305 }
305 } 306 }
306 307
308 void FillGPUInfoFromSystemInfo(GPUInfo* gpu_info,
309 angle::SystemInfo* system_info) {
310 angle::GPUDeviceInfo* primary =
311 &system_info->gpus[system_info->primaryGPUIndex];
312
313 gpu_info->gpu.vendor_id = primary->vendorId;
314 gpu_info->gpu.device_id = primary->deviceId;
315
316 gpu_info->driver_vendor = std::move(primary->driverVendor);
317 gpu_info->driver_version = std::move(primary->driverVersion);
318 gpu_info->driver_date = std::move(primary->driverDate);
319
320 for (size_t i = 0; i < system_info->gpus.size(); i++) {
321 if (static_cast<int>(i) == system_info->primaryGPUIndex) {
322 continue;
323 }
324
325 GPUInfo::GPUDevice device;
326 device.vendor_id = system_info->gpus[i].vendorId;
327 device.device_id = system_info->gpus[i].deviceId;
328
329 gpu_info->secondary_gpus.push_back(device);
330 }
331
332 gpu_info->optimus = system_info->isOptimus;
333 gpu_info->amd_switchable = system_info->isAMDSwitchable;
334
335 gpu_info->machine_model_name = system_info->machineModelName;
336 gpu_info->machine_model_version = system_info->machineModelVersion;
337 }
338
307 } // namespace gpu 339 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/config/gpu_info_collector.h ('k') | gpu/config/gpu_info_collector_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698