| 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/re2/re2.h" | 8 #include "third_party/re2/src/re2/re2.h" |
| 9 | 9 |
| 10 #include <windows.h> | 10 #include <windows.h> |
| 11 #include <cfgmgr32.h> | 11 #include <cfgmgr32.h> |
| 12 #include <d3d9.h> | 12 #include <d3d9.h> |
| 13 #include <d3d11.h> | 13 #include <d3d11.h> |
| 14 #include <dxgi.h> | 14 #include <dxgi.h> |
| 15 #include <setupapi.h> | 15 #include <setupapi.h> |
| 16 | 16 |
| 17 #include "base/command_line.h" | 17 #include "base/command_line.h" |
| 18 #include "base/files/file_enumerator.h" | 18 #include "base/files/file_enumerator.h" |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 } | 493 } |
| 494 | 494 |
| 495 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 495 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
| 496 | 496 |
| 497 basic_gpu_info->dx_diagnostics_info_state = | 497 basic_gpu_info->dx_diagnostics_info_state = |
| 498 context_gpu_info.dx_diagnostics_info_state; | 498 context_gpu_info.dx_diagnostics_info_state; |
| 499 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; | 499 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; |
| 500 } | 500 } |
| 501 | 501 |
| 502 } // namespace gpu | 502 } // namespace gpu |
| OLD | NEW |