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

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

Issue 2765593002: gpu/config: Use angle::GetSystemInfo on Mac (Closed)
Patch Set: gpu/config: Use angle::GetSystemInfo on Mac 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.cc ('k') | gpu/config/gpu_info_collector_mac.mm » ('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 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 <stddef.h>
6 #include <stdint.h>
7
8 #include <vector>
9
10 #include "base/command_line.h" 5 #include "base/command_line.h"
11 #include "base/files/file_util.h"
12 #include "base/logging.h"
13 #include "base/message_loop/message_loop.h"
14 #include "base/strings/string_piece.h"
15 #include "base/strings/string_split.h" 6 #include "base/strings/string_split.h"
16 #include "base/strings/string_tokenizer.h"
17 #include "base/strings/string_util.h"
18 #include "base/trace_event/trace_event.h" 7 #include "base/trace_event/trace_event.h"
19 #include "gpu/config/gpu_info_collector.h" 8 #include "gpu/config/gpu_info_collector.h"
20 #include "gpu/config/gpu_switches.h" 9 #include "gpu/config/gpu_switches.h"
21 #include "third_party/angle/src/gpu_info_util/SystemInfo.h" 10 #include "third_party/angle/src/gpu_info_util/SystemInfo.h"
22 #include "third_party/re2/src/re2/re2.h" 11 #include "third_party/re2/src/re2/re2.h"
23 #include "ui/gl/gl_bindings.h"
24 #include "ui/gl/gl_context.h"
25 #include "ui/gl/gl_implementation.h"
26 #include "ui/gl/gl_surface.h"
27 #include "ui/gl/gl_switches.h"
28 12
29 namespace gpu { 13 namespace gpu {
30 14
31 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) { 15 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
32 DCHECK(gpu_info); 16 DCHECK(gpu_info);
33 17
34 TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo"); 18 TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
35 19
36 CollectInfoResult result = CollectGraphicsInfoGL(gpu_info); 20 CollectInfoResult result = CollectGraphicsInfoGL(gpu_info);
37 gpu_info->context_info_state = result; 21 gpu_info->context_info_state = result;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 gpu_info->driver_version = driver_version; 76 gpu_info->driver_version = driver_version;
93 return kCollectInfoSuccess; 77 return kCollectInfoSuccess;
94 } 78 }
95 79
96 void MergeGPUInfo(GPUInfo* basic_gpu_info, 80 void MergeGPUInfo(GPUInfo* basic_gpu_info,
97 const GPUInfo& context_gpu_info) { 81 const GPUInfo& context_gpu_info) {
98 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); 82 MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
99 } 83 }
100 84
101 } // namespace gpu 85 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/config/gpu_info_collector.cc ('k') | gpu/config/gpu_info_collector_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698