| 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 gpu_info->optimus = nvd3d9wrap != NULL; | 390 gpu_info->optimus = nvd3d9wrap != NULL; |
| 391 | 391 |
| 392 gpu_info->lenovo_dcute = IsLenovoDCuteInstalled(); | 392 gpu_info->lenovo_dcute = IsLenovoDCuteInstalled(); |
| 393 | 393 |
| 394 gpu_info->display_link_version = DisplayLinkVersion(); | 394 gpu_info->display_link_version = DisplayLinkVersion(); |
| 395 | 395 |
| 396 if (!gpu_info->display_link_version .IsValid()) { | 396 if (!gpu_info->display_link_version .IsValid()) { |
| 397 UMA_HISTOGRAM_ENUMERATION("GPU.DisplayLinkInstallationStatus", | 397 UMA_HISTOGRAM_ENUMERATION("GPU.DisplayLinkInstallationStatus", |
| 398 DISPLAY_LINK_NOT_INSTALLED, | 398 DISPLAY_LINK_NOT_INSTALLED, |
| 399 DISPLAY_LINK_INSTALLATION_STATUS_MAX); | 399 DISPLAY_LINK_INSTALLATION_STATUS_MAX); |
| 400 } else if (gpu_info->display_link_version.IsOlderThan("7.2")) { | 400 } else if (gpu_info->display_link_version < base::Version("7.2")) { |
| 401 UMA_HISTOGRAM_ENUMERATION("GPU.DisplayLinkInstallationStatus", | 401 UMA_HISTOGRAM_ENUMERATION("GPU.DisplayLinkInstallationStatus", |
| 402 DISPLAY_LINK_7_1_OR_EARLIER, | 402 DISPLAY_LINK_7_1_OR_EARLIER, |
| 403 DISPLAY_LINK_INSTALLATION_STATUS_MAX); | 403 DISPLAY_LINK_INSTALLATION_STATUS_MAX); |
| 404 } else { | 404 } else { |
| 405 UMA_HISTOGRAM_ENUMERATION("GPU.DisplayLinkInstallationStatus", | 405 UMA_HISTOGRAM_ENUMERATION("GPU.DisplayLinkInstallationStatus", |
| 406 DISPLAY_LINK_7_2_OR_LATER, | 406 DISPLAY_LINK_7_2_OR_LATER, |
| 407 DISPLAY_LINK_INSTALLATION_STATUS_MAX); | 407 DISPLAY_LINK_INSTALLATION_STATUS_MAX); |
| 408 } | 408 } |
| 409 | 409 |
| 410 // Taken from http://developer.nvidia.com/object/device_ids.html | 410 // Taken from http://developer.nvidia.com/object/device_ids.html |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 495 } | 495 } |
| 496 | 496 |
| 497 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 497 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
| 498 | 498 |
| 499 basic_gpu_info->dx_diagnostics_info_state = | 499 basic_gpu_info->dx_diagnostics_info_state = |
| 500 context_gpu_info.dx_diagnostics_info_state; | 500 context_gpu_info.dx_diagnostics_info_state; |
| 501 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; | 501 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; |
| 502 } | 502 } |
| 503 | 503 |
| 504 } // namespace gpu | 504 } // namespace gpu |
| OLD | NEW |