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

Side by Side Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 2680423002: Introducing 2 usages for SwiftShader (Closed)
Patch Set: Added missing change to GpuDataManagerImplPrivate Created 3 years, 10 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 | « no previous file | content/browser/gpu/gpu_process_host.cc » ('j') | ui/gl/gl_implementation.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 command_line->AppendSwitch(switches::kDisableD3D11); 720 command_line->AppendSwitch(switches::kDisableD3D11);
721 if (gpu_driver_bugs_.find(gpu::DISABLE_ES3_GL_CONTEXT) != 721 if (gpu_driver_bugs_.find(gpu::DISABLE_ES3_GL_CONTEXT) !=
722 gpu_driver_bugs_.end()) { 722 gpu_driver_bugs_.end()) {
723 command_line->AppendSwitch(switches::kDisableES3GLContext); 723 command_line->AppendSwitch(switches::kDisableES3GLContext);
724 } 724 }
725 if (gpu_driver_bugs_.find(gpu::DISABLE_DIRECT_COMPOSITION) != 725 if (gpu_driver_bugs_.find(gpu::DISABLE_DIRECT_COMPOSITION) !=
726 gpu_driver_bugs_.end()) { 726 gpu_driver_bugs_.end()) {
727 command_line->AppendSwitch(switches::kDisableDirectComposition); 727 command_line->AppendSwitch(switches::kDisableDirectComposition);
728 } 728 }
729 if (use_swiftshader_) { 729 if (use_swiftshader_) {
730 command_line->AppendSwitchASCII(switches::kUseGL, "swiftshader"); 730 command_line->AppendSwitchASCII(
731 switches::kUseGL, gl::kGLImplementationSwiftShaderForWebGLName);
731 } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) || 732 } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) ||
732 IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING) || 733 IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING) ||
733 IsFeatureBlacklisted( 734 IsFeatureBlacklisted(
734 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)) && 735 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)) &&
735 (use_gl == "any")) { 736 (use_gl == "any")) {
736 command_line->AppendSwitchASCII(switches::kUseGL, 737 command_line->AppendSwitchASCII(switches::kUseGL,
737 gl::kGLImplementationOSMesaName); 738 gl::kGLImplementationOSMesaName);
738 } else if (!use_gl.empty()) { 739 } else if (!use_gl.empty()) {
739 command_line->AppendSwitchASCII(switches::kUseGL, use_gl); 740 command_line->AppendSwitchASCII(switches::kUseGL, use_gl);
740 } 741 }
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; 1348 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
1348 #if defined(OS_WIN) 1349 #if defined(OS_WIN)
1349 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; 1350 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
1350 #endif 1351 #endif
1351 complete_gpu_info_already_requested_ = true; 1352 complete_gpu_info_already_requested_ = true;
1352 // Some observers might be waiting. 1353 // Some observers might be waiting.
1353 NotifyGpuInfoUpdate(); 1354 NotifyGpuInfoUpdate();
1354 } 1355 }
1355 1356
1356 } // namespace content 1357 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/gpu_process_host.cc » ('j') | ui/gl/gl_implementation.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698