| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 bool direct_rendering; | 107 bool direct_rendering; |
| 108 bool sandboxed; | 108 bool sandboxed; |
| 109 int process_crash_count; | 109 int process_crash_count; |
| 110 bool in_process_gpu; | 110 bool in_process_gpu; |
| 111 CollectInfoResult basic_info_state; | 111 CollectInfoResult basic_info_state; |
| 112 CollectInfoResult context_info_state; | 112 CollectInfoResult context_info_state; |
| 113 #if defined(OS_WIN) | 113 #if defined(OS_WIN) |
| 114 CollectInfoResult dx_diagnostics_info_state; | 114 CollectInfoResult dx_diagnostics_info_state; |
| 115 DxDiagNode dx_diagnostics; | 115 DxDiagNode dx_diagnostics; |
| 116 #endif | 116 #endif |
| 117 VideoDecodeAcceleratorSupportedProfiles | 117 VideoDecodeAcceleratorCapabilities video_decode_accelerator_capabilities; |
| 118 video_decode_accelerator_supported_profiles; | |
| 119 VideoEncodeAcceleratorSupportedProfiles | 118 VideoEncodeAcceleratorSupportedProfiles |
| 120 video_encode_accelerator_supported_profiles; | 119 video_encode_accelerator_supported_profiles; |
| 121 bool jpeg_decode_accelerator_supported; | 120 bool jpeg_decode_accelerator_supported; |
| 122 }; | 121 }; |
| 123 | 122 |
| 124 // If this assert fails then most likely something below needs to be updated. | 123 // If this assert fails then most likely something below needs to be updated. |
| 125 // Note that this assert is only approximate. If a new field is added to | 124 // Note that this assert is only approximate. If a new field is added to |
| 126 // GPUInfo which fits within the current padding then it will not be caught. | 125 // GPUInfo which fits within the current padding then it will not be caught. |
| 127 static_assert( | 126 static_assert( |
| 128 sizeof(GPUInfo) == sizeof(GPUInfoKnownFields), | 127 sizeof(GPUInfo) == sizeof(GPUInfoKnownFields), |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 enumerator->AddBool("directRendering", direct_rendering); | 167 enumerator->AddBool("directRendering", direct_rendering); |
| 169 enumerator->AddBool("sandboxed", sandboxed); | 168 enumerator->AddBool("sandboxed", sandboxed); |
| 170 enumerator->AddInt("processCrashCount", process_crash_count); | 169 enumerator->AddInt("processCrashCount", process_crash_count); |
| 171 enumerator->AddBool("inProcessGpu", in_process_gpu); | 170 enumerator->AddBool("inProcessGpu", in_process_gpu); |
| 172 enumerator->AddInt("basicInfoState", basic_info_state); | 171 enumerator->AddInt("basicInfoState", basic_info_state); |
| 173 enumerator->AddInt("contextInfoState", context_info_state); | 172 enumerator->AddInt("contextInfoState", context_info_state); |
| 174 #if defined(OS_WIN) | 173 #if defined(OS_WIN) |
| 175 enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state); | 174 enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state); |
| 176 #endif | 175 #endif |
| 177 // TODO(kbr): add dx_diagnostics on Windows. | 176 // TODO(kbr): add dx_diagnostics on Windows. |
| 178 for (const auto& profile : video_decode_accelerator_supported_profiles) | 177 enumerator->AddInt("videoDecodeAcceleratorFlags", |
| 178 video_decode_accelerator_capabilities.flags); |
| 179 for (const auto& profile : |
| 180 video_decode_accelerator_capabilities.supported_profiles) |
| 179 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator); | 181 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator); |
| 180 for (const auto& profile : video_encode_accelerator_supported_profiles) | 182 for (const auto& profile : video_encode_accelerator_supported_profiles) |
| 181 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator); | 183 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator); |
| 182 enumerator->AddBool("jpegDecodeAcceleratorSupported", | 184 enumerator->AddBool("jpegDecodeAcceleratorSupported", |
| 183 jpeg_decode_accelerator_supported); | 185 jpeg_decode_accelerator_supported); |
| 184 enumerator->EndAuxAttributes(); | 186 enumerator->EndAuxAttributes(); |
| 185 } | 187 } |
| 186 | 188 |
| 187 } // namespace gpu | 189 } // namespace gpu |
| OLD | NEW |