| 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 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/debug/trace_event.h" | 11 #include "base/debug/trace_event.h" |
| 12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
| 16 #include "base/strings/string_piece.h" | 16 #include "base/strings/string_piece.h" |
| 17 #include "base/strings/string_split.h" | 17 #include "base/strings/string_split.h" |
| 18 #include "base/strings/string_tokenizer.h" | 18 #include "base/strings/string_tokenizer.h" |
| 19 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
| 20 #include "library_loaders/libpci.h" | 20 #include "library_loaders/libpci.h" |
| 21 #include "third_party/libXNVCtrl/NVCtrl.h" | 21 #include "third_party/libXNVCtrl/NVCtrl.h" |
| 22 #include "third_party/libXNVCtrl/NVCtrlLib.h" | 22 #include "third_party/libXNVCtrl/NVCtrlLib.h" |
| 23 #include "ui/gl/gl_bindings.h" | 23 #include "ui/gl/gl_bindings.h" |
| 24 #include "ui/gl/gl_context.h" | 24 #include "ui/gl/gl_context.h" |
| 25 #include "ui/gl/gl_implementation.h" | 25 #include "ui/gl/gl_implementation.h" |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 gpu_info->driver_version = driver_version; | 265 gpu_info->driver_version = driver_version; |
| 266 return true; | 266 return true; |
| 267 } | 267 } |
| 268 | 268 |
| 269 void MergeGPUInfo(GPUInfo* basic_gpu_info, | 269 void MergeGPUInfo(GPUInfo* basic_gpu_info, |
| 270 const GPUInfo& context_gpu_info) { | 270 const GPUInfo& context_gpu_info) { |
| 271 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 271 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
| 272 } | 272 } |
| 273 | 273 |
| 274 } // namespace gpu | 274 } // namespace gpu |
| OLD | NEW |