| 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 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 context_gpu_info.gl_reset_notification_strategy; | 221 context_gpu_info.gl_reset_notification_strategy; |
| 222 | 222 |
| 223 if (!context_gpu_info.driver_vendor.empty()) | 223 if (!context_gpu_info.driver_vendor.empty()) |
| 224 basic_gpu_info->driver_vendor = context_gpu_info.driver_vendor; | 224 basic_gpu_info->driver_vendor = context_gpu_info.driver_vendor; |
| 225 if (!context_gpu_info.driver_version.empty()) | 225 if (!context_gpu_info.driver_version.empty()) |
| 226 basic_gpu_info->driver_version = context_gpu_info.driver_version; | 226 basic_gpu_info->driver_version = context_gpu_info.driver_version; |
| 227 | 227 |
| 228 basic_gpu_info->sandboxed = context_gpu_info.sandboxed; | 228 basic_gpu_info->sandboxed = context_gpu_info.sandboxed; |
| 229 basic_gpu_info->direct_rendering = context_gpu_info.direct_rendering; | 229 basic_gpu_info->direct_rendering = context_gpu_info.direct_rendering; |
| 230 basic_gpu_info->in_process_gpu = context_gpu_info.in_process_gpu; | 230 basic_gpu_info->in_process_gpu = context_gpu_info.in_process_gpu; |
| 231 basic_gpu_info->passthrough_cmd_decoder = |
| 232 context_gpu_info.passthrough_cmd_decoder; |
| 231 basic_gpu_info->context_info_state = context_gpu_info.context_info_state; | 233 basic_gpu_info->context_info_state = context_gpu_info.context_info_state; |
| 232 basic_gpu_info->initialization_time = context_gpu_info.initialization_time; | 234 basic_gpu_info->initialization_time = context_gpu_info.initialization_time; |
| 233 basic_gpu_info->video_decode_accelerator_capabilities = | 235 basic_gpu_info->video_decode_accelerator_capabilities = |
| 234 context_gpu_info.video_decode_accelerator_capabilities; | 236 context_gpu_info.video_decode_accelerator_capabilities; |
| 235 basic_gpu_info->video_encode_accelerator_supported_profiles = | 237 basic_gpu_info->video_encode_accelerator_supported_profiles = |
| 236 context_gpu_info.video_encode_accelerator_supported_profiles; | 238 context_gpu_info.video_encode_accelerator_supported_profiles; |
| 237 basic_gpu_info->jpeg_decode_accelerator_supported = | 239 basic_gpu_info->jpeg_decode_accelerator_supported = |
| 238 context_gpu_info.jpeg_decode_accelerator_supported; | 240 context_gpu_info.jpeg_decode_accelerator_supported; |
| 239 | 241 |
| 240 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 242 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 } | 298 } |
| 297 for (size_t ii = 0; ii < gpu_info->secondary_gpus.size(); ++ii) { | 299 for (size_t ii = 0; ii < gpu_info->secondary_gpus.size(); ++ii) { |
| 298 if (active_vendor_id == gpu_info->secondary_gpus[ii].vendor_id) { | 300 if (active_vendor_id == gpu_info->secondary_gpus[ii].vendor_id) { |
| 299 gpu_info->secondary_gpus[ii].active = true; | 301 gpu_info->secondary_gpus[ii].active = true; |
| 300 return; | 302 return; |
| 301 } | 303 } |
| 302 } | 304 } |
| 303 } | 305 } |
| 304 | 306 |
| 305 } // namespace gpu | 307 } // namespace gpu |
| OLD | NEW |