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

Unified Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 2460943002: Lower ES3 capable requirement to GL 3.3 with extensions. (Closed)
Patch Set: address piman comment Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/compositor_util.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_data_manager_impl_private.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index d0ea0601f2425cf2a1b69656fab30ab8ebd0f236..ee5ca2594a7ff2af75a81208b61fbe91e78fba8f 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -166,23 +166,28 @@ void UpdateStats(const gpu::GPUInfo& gpu_info,
gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS,
gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING,
gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION,
- gpu::GPU_FEATURE_TYPE_WEBGL};
+ gpu::GPU_FEATURE_TYPE_WEBGL,
+ gpu::GPU_FEATURE_TYPE_WEBGL2};
const std::string kGpuBlacklistFeatureHistogramNames[] = {
"GPU.BlacklistFeatureTestResults.Accelerated2dCanvas",
"GPU.BlacklistFeatureTestResults.GpuCompositing",
"GPU.BlacklistFeatureTestResults.GpuRasterization",
- "GPU.BlacklistFeatureTestResults.Webgl"};
+ "GPU.BlacklistFeatureTestResults.Webgl",
+ "GPU.BlacklistFeatureTestResults.Webgl2"};
const bool kGpuFeatureUserFlags[] = {
command_line.HasSwitch(switches::kDisableAccelerated2dCanvas),
command_line.HasSwitch(switches::kDisableGpu),
command_line.HasSwitch(switches::kDisableGpuRasterization),
- command_line.HasSwitch(switches::kDisableExperimentalWebGL)};
+ command_line.HasSwitch(switches::kDisableExperimentalWebGL),
+ (!command_line.HasSwitch(switches::kEnableUnsafeES3APIs) ||
+ command_line.HasSwitch(switches::kDisableES3APIs))};
#if defined(OS_WIN)
const std::string kGpuBlacklistFeatureHistogramNamesWin[] = {
"GPU.BlacklistFeatureTestResultsWindows.Accelerated2dCanvas",
"GPU.BlacklistFeatureTestResultsWindows.GpuCompositing",
"GPU.BlacklistFeatureTestResultsWindows.GpuRasterization",
- "GPU.BlacklistFeatureTestResultsWindows.Webgl"};
+ "GPU.BlacklistFeatureTestResultsWindows.Webgl",
+ "GPU.BlacklistFeatureTestResultsWindows.Webgl2"};
#endif
const size_t kNumFeatures =
sizeof(kGpuFeatures) / sizeof(gpu::GpuFeatureType);
@@ -760,6 +765,11 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine(
}
#endif
+ if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2) &&
+ !command_line->HasSwitch(switches::kDisableES3APIs)) {
+ command_line->AppendSwitch(switches::kDisableES3APIs);
+ }
+
// Pass GPU and driver information to GPU process. We try to avoid full GPU
// info collection at GPU process startup, but we need gpu vendor_id,
// device_id, driver_vendor, driver_version for deciding whether we need to
« no previous file with comments | « content/browser/gpu/compositor_util.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698