OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/browser/gpu/gpu_data_manager_impl_private.h" | 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
694 if (gpu_driver_bugs_.find(gpu::DISABLE_D3D11) != gpu_driver_bugs_.end()) | 694 if (gpu_driver_bugs_.find(gpu::DISABLE_D3D11) != gpu_driver_bugs_.end()) |
695 command_line->AppendSwitch(switches::kDisableD3D11); | 695 command_line->AppendSwitch(switches::kDisableD3D11); |
696 if (gpu_driver_bugs_.find(gpu::DISABLE_ES3_GL_CONTEXT) != | 696 if (gpu_driver_bugs_.find(gpu::DISABLE_ES3_GL_CONTEXT) != |
697 gpu_driver_bugs_.end()) { | 697 gpu_driver_bugs_.end()) { |
698 command_line->AppendSwitch(switches::kDisableES3GLContext); | 698 command_line->AppendSwitch(switches::kDisableES3GLContext); |
699 } | 699 } |
700 if (gpu_driver_bugs_.find(gpu::DISABLE_DIRECT_COMPOSITION) != | 700 if (gpu_driver_bugs_.find(gpu::DISABLE_DIRECT_COMPOSITION) != |
701 gpu_driver_bugs_.end()) { | 701 gpu_driver_bugs_.end()) { |
702 command_line->AppendSwitch(switches::kDisableDirectComposition); | 702 command_line->AppendSwitch(switches::kDisableDirectComposition); |
703 } | 703 } |
| 704 if (gpu_driver_bugs_.find(gpu::SANDBOX_START_EARLY) != |
| 705 gpu_driver_bugs_.end() && |
| 706 !command_line->HasSwitch(switches::kGpuTestingGLRenderer) && |
| 707 !command_line->HasSwitch(switches::kGpuTestingGLVersion)) { |
| 708 command_line->AppendSwitch(switches::kGpuSandboxStartEarly); |
| 709 } |
704 if (use_swiftshader_) { | 710 if (use_swiftshader_) { |
705 command_line->AppendSwitchASCII(switches::kUseGL, "swiftshader"); | 711 command_line->AppendSwitchASCII(switches::kUseGL, "swiftshader"); |
706 } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) || | 712 } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) || |
707 IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING) || | 713 IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING) || |
708 IsFeatureBlacklisted( | 714 IsFeatureBlacklisted( |
709 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)) && | 715 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)) && |
710 (use_gl == "any")) { | 716 (use_gl == "any")) { |
711 command_line->AppendSwitchASCII(switches::kUseGL, | 717 command_line->AppendSwitchASCII(switches::kUseGL, |
712 gl::kGLImplementationOSMesaName); | 718 gl::kGLImplementationOSMesaName); |
713 } else if (!use_gl.empty()) { | 719 } else if (!use_gl.empty()) { |
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1289 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1295 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
1290 #if defined(OS_WIN) | 1296 #if defined(OS_WIN) |
1291 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1297 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
1292 #endif | 1298 #endif |
1293 complete_gpu_info_already_requested_ = true; | 1299 complete_gpu_info_already_requested_ = true; |
1294 // Some observers might be waiting. | 1300 // Some observers might be waiting. |
1295 NotifyGpuInfoUpdate(); | 1301 NotifyGpuInfoUpdate(); |
1296 } | 1302 } |
1297 | 1303 |
1298 } // namespace content | 1304 } // namespace content |
OLD | NEW |