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 689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
700 if (gpu_driver_bugs_.find(gpu::DISABLE_D3D11) != gpu_driver_bugs_.end()) | 700 if (gpu_driver_bugs_.find(gpu::DISABLE_D3D11) != gpu_driver_bugs_.end()) |
701 command_line->AppendSwitch(switches::kDisableD3D11); | 701 command_line->AppendSwitch(switches::kDisableD3D11); |
702 if (gpu_driver_bugs_.find(gpu::DISABLE_ES3_GL_CONTEXT) != | 702 if (gpu_driver_bugs_.find(gpu::DISABLE_ES3_GL_CONTEXT) != |
703 gpu_driver_bugs_.end()) { | 703 gpu_driver_bugs_.end()) { |
704 command_line->AppendSwitch(switches::kDisableES3GLContext); | 704 command_line->AppendSwitch(switches::kDisableES3GLContext); |
705 } | 705 } |
706 if (gpu_driver_bugs_.find(gpu::DISABLE_DIRECT_COMPOSITION) != | 706 if (gpu_driver_bugs_.find(gpu::DISABLE_DIRECT_COMPOSITION) != |
707 gpu_driver_bugs_.end()) { | 707 gpu_driver_bugs_.end()) { |
708 command_line->AppendSwitch(switches::kDisableDirectComposition); | 708 command_line->AppendSwitch(switches::kDisableDirectComposition); |
709 } | 709 } |
| 710 if (gpu_driver_bugs_.find(gpu::SANDBOX_START_EARLY) != |
| 711 gpu_driver_bugs_.end() && |
| 712 !command_line->HasSwitch(switches::kGpuTestingGLRenderer) && |
| 713 !command_line->HasSwitch(switches::kGpuTestingGLVersion)) { |
| 714 command_line->AppendSwitch(switches::kGpuSandboxStartEarly); |
| 715 } |
710 if (use_swiftshader_) { | 716 if (use_swiftshader_) { |
711 command_line->AppendSwitchASCII(switches::kUseGL, "swiftshader"); | 717 command_line->AppendSwitchASCII(switches::kUseGL, "swiftshader"); |
712 } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) || | 718 } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) || |
713 IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING) || | 719 IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING) || |
714 IsFeatureBlacklisted( | 720 IsFeatureBlacklisted( |
715 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)) && | 721 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)) && |
716 (use_gl == "any")) { | 722 (use_gl == "any")) { |
717 command_line->AppendSwitchASCII(switches::kUseGL, | 723 command_line->AppendSwitchASCII(switches::kUseGL, |
718 gl::kGLImplementationOSMesaName); | 724 gl::kGLImplementationOSMesaName); |
719 } else if (!use_gl.empty()) { | 725 } else if (!use_gl.empty()) { |
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1295 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1301 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
1296 #if defined(OS_WIN) | 1302 #if defined(OS_WIN) |
1297 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1303 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
1298 #endif | 1304 #endif |
1299 complete_gpu_info_already_requested_ = true; | 1305 complete_gpu_info_already_requested_ = true; |
1300 // Some observers might be waiting. | 1306 // Some observers might be waiting. |
1301 NotifyGpuInfoUpdate(); | 1307 NotifyGpuInfoUpdate(); |
1302 } | 1308 } |
1303 | 1309 |
1304 } // namespace content | 1310 } // namespace content |
OLD | NEW |