| 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include "gpu/config/gpu_info.h" | 7 #include "gpu/config/gpu_info.h" |
| 8 | 8 |
| 9 namespace { | 9 namespace { |
| 10 | 10 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 : optimus(false), | 69 : optimus(false), |
| 70 amd_switchable(false), | 70 amd_switchable(false), |
| 71 lenovo_dcute(false), | 71 lenovo_dcute(false), |
| 72 adapter_luid(0), | 72 adapter_luid(0), |
| 73 gl_reset_notification_strategy(0), | 73 gl_reset_notification_strategy(0), |
| 74 software_rendering(false), | 74 software_rendering(false), |
| 75 direct_rendering(true), | 75 direct_rendering(true), |
| 76 sandboxed(false), | 76 sandboxed(false), |
| 77 process_crash_count(0), | 77 process_crash_count(0), |
| 78 in_process_gpu(true), | 78 in_process_gpu(true), |
| 79 passthrough_cmd_decoder(false), |
| 79 basic_info_state(kCollectInfoNone), | 80 basic_info_state(kCollectInfoNone), |
| 80 context_info_state(kCollectInfoNone), | 81 context_info_state(kCollectInfoNone), |
| 81 #if defined(OS_WIN) | 82 #if defined(OS_WIN) |
| 82 dx_diagnostics_info_state(kCollectInfoNone), | 83 dx_diagnostics_info_state(kCollectInfoNone), |
| 83 #endif | 84 #endif |
| 84 jpeg_decode_accelerator_supported(false) | 85 jpeg_decode_accelerator_supported(false) |
| 85 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 86 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| 86 , | 87 , |
| 87 system_visual(0), | 88 system_visual(0), |
| 88 rgba_visual(0) | 89 rgba_visual(0) |
| (...skipping 29 matching lines...) Expand all Loading... |
| 118 std::string gl_extensions; | 119 std::string gl_extensions; |
| 119 std::string gl_ws_vendor; | 120 std::string gl_ws_vendor; |
| 120 std::string gl_ws_version; | 121 std::string gl_ws_version; |
| 121 std::string gl_ws_extensions; | 122 std::string gl_ws_extensions; |
| 122 uint32_t gl_reset_notification_strategy; | 123 uint32_t gl_reset_notification_strategy; |
| 123 bool software_rendering; | 124 bool software_rendering; |
| 124 bool direct_rendering; | 125 bool direct_rendering; |
| 125 bool sandboxed; | 126 bool sandboxed; |
| 126 int process_crash_count; | 127 int process_crash_count; |
| 127 bool in_process_gpu; | 128 bool in_process_gpu; |
| 129 bool passthrough_cmd_decoder; |
| 128 CollectInfoResult basic_info_state; | 130 CollectInfoResult basic_info_state; |
| 129 CollectInfoResult context_info_state; | 131 CollectInfoResult context_info_state; |
| 130 #if defined(OS_WIN) | 132 #if defined(OS_WIN) |
| 131 CollectInfoResult dx_diagnostics_info_state; | 133 CollectInfoResult dx_diagnostics_info_state; |
| 132 DxDiagNode dx_diagnostics; | 134 DxDiagNode dx_diagnostics; |
| 133 #endif | 135 #endif |
| 134 VideoDecodeAcceleratorCapabilities video_decode_accelerator_capabilities; | 136 VideoDecodeAcceleratorCapabilities video_decode_accelerator_capabilities; |
| 135 VideoEncodeAcceleratorSupportedProfiles | 137 VideoEncodeAcceleratorSupportedProfiles |
| 136 video_encode_accelerator_supported_profiles; | 138 video_encode_accelerator_supported_profiles; |
| 137 bool jpeg_decode_accelerator_supported; | 139 bool jpeg_decode_accelerator_supported; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 enumerator->AddString("glWsExtensions", gl_ws_extensions); | 183 enumerator->AddString("glWsExtensions", gl_ws_extensions); |
| 182 enumerator->AddInt( | 184 enumerator->AddInt( |
| 183 "glResetNotificationStrategy", | 185 "glResetNotificationStrategy", |
| 184 static_cast<int>(gl_reset_notification_strategy)); | 186 static_cast<int>(gl_reset_notification_strategy)); |
| 185 // TODO(kbr): add performance_stats. | 187 // TODO(kbr): add performance_stats. |
| 186 enumerator->AddBool("softwareRendering", software_rendering); | 188 enumerator->AddBool("softwareRendering", software_rendering); |
| 187 enumerator->AddBool("directRendering", direct_rendering); | 189 enumerator->AddBool("directRendering", direct_rendering); |
| 188 enumerator->AddBool("sandboxed", sandboxed); | 190 enumerator->AddBool("sandboxed", sandboxed); |
| 189 enumerator->AddInt("processCrashCount", process_crash_count); | 191 enumerator->AddInt("processCrashCount", process_crash_count); |
| 190 enumerator->AddBool("inProcessGpu", in_process_gpu); | 192 enumerator->AddBool("inProcessGpu", in_process_gpu); |
| 193 enumerator->AddBool("passthroughCmdDecoder", passthrough_cmd_decoder); |
| 191 enumerator->AddInt("basicInfoState", basic_info_state); | 194 enumerator->AddInt("basicInfoState", basic_info_state); |
| 192 enumerator->AddInt("contextInfoState", context_info_state); | 195 enumerator->AddInt("contextInfoState", context_info_state); |
| 193 #if defined(OS_WIN) | 196 #if defined(OS_WIN) |
| 194 enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state); | 197 enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state); |
| 195 #endif | 198 #endif |
| 196 // TODO(kbr): add dx_diagnostics on Windows. | 199 // TODO(kbr): add dx_diagnostics on Windows. |
| 197 enumerator->AddInt("videoDecodeAcceleratorFlags", | 200 enumerator->AddInt("videoDecodeAcceleratorFlags", |
| 198 video_decode_accelerator_capabilities.flags); | 201 video_decode_accelerator_capabilities.flags); |
| 199 for (const auto& profile : | 202 for (const auto& profile : |
| 200 video_decode_accelerator_capabilities.supported_profiles) | 203 video_decode_accelerator_capabilities.supported_profiles) |
| 201 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator); | 204 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator); |
| 202 for (const auto& profile : video_encode_accelerator_supported_profiles) | 205 for (const auto& profile : video_encode_accelerator_supported_profiles) |
| 203 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator); | 206 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator); |
| 204 enumerator->AddBool("jpegDecodeAcceleratorSupported", | 207 enumerator->AddBool("jpegDecodeAcceleratorSupported", |
| 205 jpeg_decode_accelerator_supported); | 208 jpeg_decode_accelerator_supported); |
| 206 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 209 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| 207 enumerator->AddInt64("systemVisual", system_visual); | 210 enumerator->AddInt64("systemVisual", system_visual); |
| 208 enumerator->AddInt64("rgbaVisual", rgba_visual); | 211 enumerator->AddInt64("rgbaVisual", rgba_visual); |
| 209 #endif | 212 #endif |
| 210 enumerator->EndAuxAttributes(); | 213 enumerator->EndAuxAttributes(); |
| 211 } | 214 } |
| 212 | 215 |
| 213 } // namespace gpu | 216 } // namespace gpu |
| OLD | NEW |