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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
11 #include "base/file_util.h" | 11 #include "base/files/file_util.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
15 #include "base/strings/string_piece.h" | 15 #include "base/strings/string_piece.h" |
16 #include "base/strings/string_split.h" | 16 #include "base/strings/string_split.h" |
17 #include "base/strings/string_tokenizer.h" | 17 #include "base/strings/string_tokenizer.h" |
18 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
19 #include "gpu/config/gpu_info_collector.h" | 19 #include "gpu/config/gpu_info_collector.h" |
20 #include "library_loaders/libpci.h" | 20 #include "library_loaders/libpci.h" |
21 #include "ui/gl/gl_bindings.h" | 21 #include "ui/gl/gl_bindings.h" |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 gpu_info->driver_version = driver_version; | 254 gpu_info->driver_version = driver_version; |
255 return kCollectInfoSuccess; | 255 return kCollectInfoSuccess; |
256 } | 256 } |
257 | 257 |
258 void MergeGPUInfo(GPUInfo* basic_gpu_info, | 258 void MergeGPUInfo(GPUInfo* basic_gpu_info, |
259 const GPUInfo& context_gpu_info) { | 259 const GPUInfo& context_gpu_info) { |
260 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 260 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
261 } | 261 } |
262 | 262 |
263 } // namespace gpu | 263 } // namespace gpu |
OLD | NEW |