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 // This has to be included before windows.h. | 7 // This has to be included before windows.h. |
8 #include "third_party/re2/src/re2/re2.h" | 8 #include "third_party/re2/src/re2/re2.h" |
9 | 9 |
10 #include <windows.h> | 10 #include <windows.h> |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "base/strings/string_number_conversions.h" | 29 #include "base/strings/string_number_conversions.h" |
30 #include "base/strings/string_util.h" | 30 #include "base/strings/string_util.h" |
31 #include "base/strings/stringprintf.h" | 31 #include "base/strings/stringprintf.h" |
32 #include "base/strings/utf_string_conversions.h" | 32 #include "base/strings/utf_string_conversions.h" |
33 #include "base/threading/thread.h" | 33 #include "base/threading/thread.h" |
34 #include "base/threading/worker_pool.h" | 34 #include "base/threading/worker_pool.h" |
35 #include "base/trace_event/trace_event.h" | 35 #include "base/trace_event/trace_event.h" |
36 #include "base/win/scoped_com_initializer.h" | 36 #include "base/win/scoped_com_initializer.h" |
37 #include "base/win/scoped_comptr.h" | 37 #include "base/win/scoped_comptr.h" |
38 #include "base/win/windows_version.h" | 38 #include "base/win/windows_version.h" |
39 #include "third_party/libxml/chromium/libxml_utils.h" | |
40 #include "ui/gl/gl_implementation.h" | 39 #include "ui/gl/gl_implementation.h" |
41 #include "ui/gl/gl_surface_egl.h" | 40 #include "ui/gl/gl_surface_egl.h" |
42 | 41 |
43 namespace gpu { | 42 namespace gpu { |
44 | 43 |
45 namespace { | 44 namespace { |
46 | 45 |
47 void DeviceIDToVendorAndDevice(const std::wstring& id, | 46 void DeviceIDToVendorAndDevice(const std::wstring& id, |
48 uint32_t* vendor_id, | 47 uint32_t* vendor_id, |
49 uint32_t* device_id) { | 48 uint32_t* device_id) { |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 } | 410 } |
412 | 411 |
413 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 412 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
414 | 413 |
415 basic_gpu_info->dx_diagnostics_info_state = | 414 basic_gpu_info->dx_diagnostics_info_state = |
416 context_gpu_info.dx_diagnostics_info_state; | 415 context_gpu_info.dx_diagnostics_info_state; |
417 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; | 416 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; |
418 } | 417 } |
419 | 418 |
420 } // namespace gpu | 419 } // namespace gpu |
OLD | NEW |