| 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.h" | 5 #include "gpu/config/gpu_info.h" |
| 6 | 6 |
| 7 namespace { | 7 namespace { |
| 8 | 8 |
| 9 void EnumerateGPUDevice(const gpu::GPUInfo::GPUDevice& device, | 9 void EnumerateGPUDevice(const gpu::GPUInfo::GPUDevice& device, |
| 10 gpu::GPUInfo::Enumerator* enumerator) { | 10 gpu::GPUInfo::Enumerator* enumerator) { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 : optimus(false), | 58 : optimus(false), |
| 59 amd_switchable(false), | 59 amd_switchable(false), |
| 60 lenovo_dcute(false), | 60 lenovo_dcute(false), |
| 61 adapter_luid(0), | 61 adapter_luid(0), |
| 62 gl_reset_notification_strategy(0), | 62 gl_reset_notification_strategy(0), |
| 63 can_lose_context(false), | 63 can_lose_context(false), |
| 64 software_rendering(false), | 64 software_rendering(false), |
| 65 direct_rendering(true), | 65 direct_rendering(true), |
| 66 sandboxed(false), | 66 sandboxed(false), |
| 67 process_crash_count(0), | 67 process_crash_count(0), |
| 68 in_process_gpu(true), |
| 68 basic_info_state(kCollectInfoNone), | 69 basic_info_state(kCollectInfoNone), |
| 69 #if defined(OS_WIN) | 70 #if defined(OS_WIN) |
| 70 context_info_state(kCollectInfoNone), | 71 context_info_state(kCollectInfoNone), |
| 71 dx_diagnostics_info_state(kCollectInfoNone) { | 72 dx_diagnostics_info_state(kCollectInfoNone) { |
| 72 #else | 73 #else |
| 73 context_info_state(kCollectInfoNone) { | 74 context_info_state(kCollectInfoNone) { |
| 74 #endif | 75 #endif |
| 75 } | 76 } |
| 76 | 77 |
| 77 GPUInfo::~GPUInfo() { } | 78 GPUInfo::~GPUInfo() { } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 100 std::string gl_extensions; | 101 std::string gl_extensions; |
| 101 std::string gl_ws_vendor; | 102 std::string gl_ws_vendor; |
| 102 std::string gl_ws_version; | 103 std::string gl_ws_version; |
| 103 std::string gl_ws_extensions; | 104 std::string gl_ws_extensions; |
| 104 uint32 gl_reset_notification_strategy; | 105 uint32 gl_reset_notification_strategy; |
| 105 bool can_lose_context; | 106 bool can_lose_context; |
| 106 bool software_rendering; | 107 bool software_rendering; |
| 107 bool direct_rendering; | 108 bool direct_rendering; |
| 108 bool sandboxed; | 109 bool sandboxed; |
| 109 int process_crash_count; | 110 int process_crash_count; |
| 111 bool in_process_gpu; |
| 110 CollectInfoResult basic_info_state; | 112 CollectInfoResult basic_info_state; |
| 111 CollectInfoResult context_info_state; | 113 CollectInfoResult context_info_state; |
| 112 #if defined(OS_WIN) | 114 #if defined(OS_WIN) |
| 113 CollectInfoResult dx_diagnostics_info_state; | 115 CollectInfoResult dx_diagnostics_info_state; |
| 114 DxDiagNode dx_diagnostics; | 116 DxDiagNode dx_diagnostics; |
| 115 #endif | 117 #endif |
| 116 VideoDecodeAcceleratorSupportedProfiles | 118 VideoDecodeAcceleratorSupportedProfiles |
| 117 video_decode_accelerator_supported_profiles; | 119 video_decode_accelerator_supported_profiles; |
| 118 VideoEncodeAcceleratorSupportedProfiles | 120 VideoEncodeAcceleratorSupportedProfiles |
| 119 video_encode_accelerator_supported_profiles; | 121 video_encode_accelerator_supported_profiles; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 enumerator->AddString("glWsExtensions", gl_ws_extensions); | 161 enumerator->AddString("glWsExtensions", gl_ws_extensions); |
| 160 enumerator->AddInt( | 162 enumerator->AddInt( |
| 161 "glResetNotificationStrategy", | 163 "glResetNotificationStrategy", |
| 162 static_cast<int>(gl_reset_notification_strategy)); | 164 static_cast<int>(gl_reset_notification_strategy)); |
| 163 enumerator->AddBool("can_lose_context", can_lose_context); | 165 enumerator->AddBool("can_lose_context", can_lose_context); |
| 164 // TODO(kbr): add performance_stats. | 166 // TODO(kbr): add performance_stats. |
| 165 enumerator->AddBool("softwareRendering", software_rendering); | 167 enumerator->AddBool("softwareRendering", software_rendering); |
| 166 enumerator->AddBool("directRendering", direct_rendering); | 168 enumerator->AddBool("directRendering", direct_rendering); |
| 167 enumerator->AddBool("sandboxed", sandboxed); | 169 enumerator->AddBool("sandboxed", sandboxed); |
| 168 enumerator->AddInt("processCrashCount", process_crash_count); | 170 enumerator->AddInt("processCrashCount", process_crash_count); |
| 171 enumerator->AddBool("inProcessGpu", in_process_gpu); |
| 169 enumerator->AddInt("basicInfoState", basic_info_state); | 172 enumerator->AddInt("basicInfoState", basic_info_state); |
| 170 enumerator->AddInt("contextInfoState", context_info_state); | 173 enumerator->AddInt("contextInfoState", context_info_state); |
| 171 #if defined(OS_WIN) | 174 #if defined(OS_WIN) |
| 172 enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state); | 175 enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state); |
| 173 #endif | 176 #endif |
| 174 // TODO(kbr): add dx_diagnostics on Windows. | 177 // TODO(kbr): add dx_diagnostics on Windows. |
| 175 for (const auto& profile : video_decode_accelerator_supported_profiles) | 178 for (const auto& profile : video_decode_accelerator_supported_profiles) |
| 176 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator); | 179 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator); |
| 177 for (const auto& profile : video_encode_accelerator_supported_profiles) | 180 for (const auto& profile : video_encode_accelerator_supported_profiles) |
| 178 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator); | 181 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator); |
| 179 enumerator->EndAuxAttributes(); | 182 enumerator->EndAuxAttributes(); |
| 180 } | 183 } |
| 181 | 184 |
| 182 } // namespace gpu | 185 } // namespace gpu |
| OLD | NEW |