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

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

Issue 1252293002: Revert of Allow WebGL on Android if the GPU has it's own process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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.cc » ('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 "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
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),
69 basic_info_state(kCollectInfoNone), 68 basic_info_state(kCollectInfoNone),
70 #if defined(OS_WIN) 69 #if defined(OS_WIN)
71 context_info_state(kCollectInfoNone), 70 context_info_state(kCollectInfoNone),
72 dx_diagnostics_info_state(kCollectInfoNone) { 71 dx_diagnostics_info_state(kCollectInfoNone) {
73 #else 72 #else
74 context_info_state(kCollectInfoNone) { 73 context_info_state(kCollectInfoNone) {
75 #endif 74 #endif
76 } 75 }
77 76
78 GPUInfo::~GPUInfo() { } 77 GPUInfo::~GPUInfo() { }
(...skipping 22 matching lines...) Expand all
101 std::string gl_extensions; 100 std::string gl_extensions;
102 std::string gl_ws_vendor; 101 std::string gl_ws_vendor;
103 std::string gl_ws_version; 102 std::string gl_ws_version;
104 std::string gl_ws_extensions; 103 std::string gl_ws_extensions;
105 uint32 gl_reset_notification_strategy; 104 uint32 gl_reset_notification_strategy;
106 bool can_lose_context; 105 bool can_lose_context;
107 bool software_rendering; 106 bool software_rendering;
108 bool direct_rendering; 107 bool direct_rendering;
109 bool sandboxed; 108 bool sandboxed;
110 int process_crash_count; 109 int process_crash_count;
111 bool in_process_gpu;
112 CollectInfoResult basic_info_state; 110 CollectInfoResult basic_info_state;
113 CollectInfoResult context_info_state; 111 CollectInfoResult context_info_state;
114 #if defined(OS_WIN) 112 #if defined(OS_WIN)
115 CollectInfoResult dx_diagnostics_info_state; 113 CollectInfoResult dx_diagnostics_info_state;
116 DxDiagNode dx_diagnostics; 114 DxDiagNode dx_diagnostics;
117 #endif 115 #endif
118 VideoDecodeAcceleratorSupportedProfiles 116 VideoDecodeAcceleratorSupportedProfiles
119 video_decode_accelerator_supported_profiles; 117 video_decode_accelerator_supported_profiles;
120 VideoEncodeAcceleratorSupportedProfiles 118 VideoEncodeAcceleratorSupportedProfiles
121 video_encode_accelerator_supported_profiles; 119 video_encode_accelerator_supported_profiles;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 enumerator->AddString("glWsExtensions", gl_ws_extensions); 159 enumerator->AddString("glWsExtensions", gl_ws_extensions);
162 enumerator->AddInt( 160 enumerator->AddInt(
163 "glResetNotificationStrategy", 161 "glResetNotificationStrategy",
164 static_cast<int>(gl_reset_notification_strategy)); 162 static_cast<int>(gl_reset_notification_strategy));
165 enumerator->AddBool("can_lose_context", can_lose_context); 163 enumerator->AddBool("can_lose_context", can_lose_context);
166 // TODO(kbr): add performance_stats. 164 // TODO(kbr): add performance_stats.
167 enumerator->AddBool("softwareRendering", software_rendering); 165 enumerator->AddBool("softwareRendering", software_rendering);
168 enumerator->AddBool("directRendering", direct_rendering); 166 enumerator->AddBool("directRendering", direct_rendering);
169 enumerator->AddBool("sandboxed", sandboxed); 167 enumerator->AddBool("sandboxed", sandboxed);
170 enumerator->AddInt("processCrashCount", process_crash_count); 168 enumerator->AddInt("processCrashCount", process_crash_count);
171 enumerator->AddBool("inProcessGpu", in_process_gpu);
172 enumerator->AddInt("basicInfoState", basic_info_state); 169 enumerator->AddInt("basicInfoState", basic_info_state);
173 enumerator->AddInt("contextInfoState", context_info_state); 170 enumerator->AddInt("contextInfoState", context_info_state);
174 #if defined(OS_WIN) 171 #if defined(OS_WIN)
175 enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state); 172 enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state);
176 #endif 173 #endif
177 // TODO(kbr): add dx_diagnostics on Windows. 174 // TODO(kbr): add dx_diagnostics on Windows.
178 for (const auto& profile : video_decode_accelerator_supported_profiles) 175 for (const auto& profile : video_decode_accelerator_supported_profiles)
179 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator); 176 EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator);
180 for (const auto& profile : video_encode_accelerator_supported_profiles) 177 for (const auto& profile : video_encode_accelerator_supported_profiles)
181 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator); 178 EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator);
182 enumerator->EndAuxAttributes(); 179 enumerator->EndAuxAttributes();
183 } 180 }
184 181
185 } // namespace gpu 182 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/config/gpu_info.h ('k') | gpu/config/gpu_info_collector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698