| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 #if defined(OS_WIN) | 80 #if defined(OS_WIN) |
| 81 dx_diagnostics_info_state(kCollectInfoNone), | 81 dx_diagnostics_info_state(kCollectInfoNone), |
| 82 #endif | 82 #endif |
| 83 jpeg_decode_accelerator_supported(false) | 83 jpeg_decode_accelerator_supported(false) |
| 84 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 84 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| 85 , | 85 , |
| 86 system_visual(0), | 86 system_visual(0), |
| 87 rgba_visual(0) | 87 rgba_visual(0) |
| 88 #endif | 88 #endif |
| 89 { | 89 { |
| 90 LOG(ERROR) << "JR GPU Info!!!\n"; |
| 90 } | 91 } |
| 91 | 92 |
| 92 GPUInfo::GPUInfo(const GPUInfo& other) = default; | 93 GPUInfo::GPUInfo(const GPUInfo& other) = default; |
| 93 | 94 |
| 94 GPUInfo::~GPUInfo() { } | 95 GPUInfo::~GPUInfo() { |
| 96 LOG(ERROR) << "JR GPUInfo death: " << gpu.device_id << "\n"; |
| 97 } |
| 95 | 98 |
| 96 void GPUInfo::EnumerateFields(Enumerator* enumerator) const { | 99 void GPUInfo::EnumerateFields(Enumerator* enumerator) const { |
| 97 struct GPUInfoKnownFields { | 100 struct GPUInfoKnownFields { |
| 98 base::TimeDelta initialization_time; | 101 base::TimeDelta initialization_time; |
| 99 bool optimus; | 102 bool optimus; |
| 100 bool amd_switchable; | 103 bool amd_switchable; |
| 101 GPUDevice gpu; | 104 GPUDevice gpu; |
| 102 std::vector<GPUDevice> secondary_gpus; | 105 std::vector<GPUDevice> secondary_gpus; |
| 103 std::string driver_vendor; | 106 std::string driver_vendor; |
| 104 std::string driver_version; | 107 std::string driver_version; |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 enumerator->AddBool("jpegDecodeAcceleratorSupported", | 199 enumerator->AddBool("jpegDecodeAcceleratorSupported", |
| 197 jpeg_decode_accelerator_supported); | 200 jpeg_decode_accelerator_supported); |
| 198 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 201 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| 199 enumerator->AddInt64("systemVisual", system_visual); | 202 enumerator->AddInt64("systemVisual", system_visual); |
| 200 enumerator->AddInt64("rgbaVisual", rgba_visual); | 203 enumerator->AddInt64("rgbaVisual", rgba_visual); |
| 201 #endif | 204 #endif |
| 202 enumerator->EndAuxAttributes(); | 205 enumerator->EndAuxAttributes(); |
| 203 } | 206 } |
| 204 | 207 |
| 205 } // namespace gpu | 208 } // namespace gpu |
| OLD | NEW |