Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: gpu/config/gpu_info.cc

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gpu/config/gpu_info.h ('k') | gpu/config/gpu_info_collector.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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>
6
5 #include "gpu/config/gpu_info.h" 7 #include "gpu/config/gpu_info.h"
6 8
7 namespace { 9 namespace {
8 10
9 void EnumerateGPUDevice(const gpu::GPUInfo::GPUDevice& device, 11 void EnumerateGPUDevice(const gpu::GPUInfo::GPUDevice& device,
10 gpu::GPUInfo::Enumerator* enumerator) { 12 gpu::GPUInfo::Enumerator* enumerator) {
11 enumerator->BeginGPUDevice(); 13 enumerator->BeginGPUDevice();
12 enumerator->AddInt("vendorId", device.vendor_id); 14 enumerator->AddInt("vendorId", device.vendor_id);
13 enumerator->AddInt("deviceId", device.device_id); 15 enumerator->AddInt("deviceId", device.device_id);
14 enumerator->AddBool("active", device.active); 16 enumerator->AddBool("active", device.active);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 85
84 void GPUInfo::EnumerateFields(Enumerator* enumerator) const { 86 void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
85 struct GPUInfoKnownFields { 87 struct GPUInfoKnownFields {
86 base::TimeDelta initialization_time; 88 base::TimeDelta initialization_time;
87 bool optimus; 89 bool optimus;
88 bool amd_switchable; 90 bool amd_switchable;
89 bool lenovo_dcute; 91 bool lenovo_dcute;
90 Version display_link_version; 92 Version display_link_version;
91 GPUDevice gpu; 93 GPUDevice gpu;
92 std::vector<GPUDevice> secondary_gpus; 94 std::vector<GPUDevice> secondary_gpus;
93 uint64 adapter_luid; 95 uint64_t adapter_luid;
94 std::string driver_vendor; 96 std::string driver_vendor;
95 std::string driver_version; 97 std::string driver_version;
96 std::string driver_date; 98 std::string driver_date;
97 std::string pixel_shader_version; 99 std::string pixel_shader_version;
98 std::string vertex_shader_version; 100 std::string vertex_shader_version;
99 std::string max_msaa_samples; 101 std::string max_msaa_samples;
100 std::string machine_model_name; 102 std::string machine_model_name;
101 std::string machine_model_version; 103 std::string machine_model_version;
102 std::string gl_version_string; 104 std::string gl_version_string;
103 std::string gl_vendor; 105 std::string gl_vendor;
104 std::string gl_renderer; 106 std::string gl_renderer;
105 std::string gl_extensions; 107 std::string gl_extensions;
106 std::string gl_ws_vendor; 108 std::string gl_ws_vendor;
107 std::string gl_ws_version; 109 std::string gl_ws_version;
108 std::string gl_ws_extensions; 110 std::string gl_ws_extensions;
109 uint32 gl_reset_notification_strategy; 111 uint32_t gl_reset_notification_strategy;
110 bool can_lose_context; 112 bool can_lose_context;
111 bool software_rendering; 113 bool software_rendering;
112 bool direct_rendering; 114 bool direct_rendering;
113 bool sandboxed; 115 bool sandboxed;
114 int process_crash_count; 116 int process_crash_count;
115 bool in_process_gpu; 117 bool in_process_gpu;
116 CollectInfoResult basic_info_state; 118 CollectInfoResult basic_info_state;
117 CollectInfoResult context_info_state; 119 CollectInfoResult context_info_state;
118 #if defined(OS_WIN) 120 #if defined(OS_WIN)
119 CollectInfoResult dx_diagnostics_info_state; 121 CollectInfoResult dx_diagnostics_info_state;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 video_decode_accelerator_capabilities.supported_profiles) 187 video_decode_accelerator_capabilities.supported_profiles)
186 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator); 188 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator);
187 for (const auto& profile : video_encode_accelerator_supported_profiles) 189 for (const auto& profile : video_encode_accelerator_supported_profiles)
188 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator); 190 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator);
189 enumerator->AddBool("jpegDecodeAcceleratorSupported", 191 enumerator->AddBool("jpegDecodeAcceleratorSupported",
190 jpeg_decode_accelerator_supported); 192 jpeg_decode_accelerator_supported);
191 enumerator->EndAuxAttributes(); 193 enumerator->EndAuxAttributes();
192 } 194 }
193 195
194 } // namespace gpu 196 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/config/gpu_info.h ('k') | gpu/config/gpu_info_collector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698