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

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

Issue 2715563002: Moving SwiftShader from component to bundled library (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
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 8d21371fd09cb5f40b3f03622d96e787eb5c1ab4..c093c07cb9fdc05d275d570769ecd3931ac7ccc9 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -440,12 +440,6 @@ bool GpuDataManagerImplPrivate::ShouldUseSwiftShader() const {
return use_swiftshader_;
}
-void GpuDataManagerImplPrivate::RegisterSwiftShaderPath(
- const base::FilePath& path) {
- swiftshader_path_ = path;
- EnableSwiftShaderIfNecessary();
-}
-
void GpuDataManagerImplPrivate::AddObserver(GpuDataManagerObserver* observer) {
GpuDataManagerImpl::UnlockedSession session(owner_);
observer_list_->AddObserver(observer);
@@ -754,11 +748,6 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine(
else
command_line->AppendSwitchASCII(switches::kSupportsDualGpus, "false");
- if (!swiftshader_path_.empty()) {
- command_line->AppendSwitchPath(switches::kSwiftShaderPath,
- swiftshader_path_);
- }
-
if (!gpu_driver_bugs_.empty()) {
command_line->AppendSwitchASCII(switches::kGpuDriverBugWorkarounds,
IntSetToString(gpu_driver_bugs_));
@@ -1139,8 +1128,6 @@ GpuDataManagerImplPrivate::GpuDataManagerImplPrivate(GpuDataManagerImpl* owner)
DCHECK(owner_);
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
- swiftshader_path_ = command_line->GetSwitchValuePath(
- switches::kSwiftShaderPath);
if (ShouldDisableHardwareAcceleration())
DisableHardwareAcceleration();
@@ -1245,9 +1232,8 @@ void GpuDataManagerImplPrivate::NotifyGpuInfoUpdate() {
void GpuDataManagerImplPrivate::EnableSwiftShaderIfNecessary() {
if (!GpuAccessAllowed(NULL) ||
blacklisted_features_.count(gpu::GPU_FEATURE_TYPE_WEBGL)) {
- if (!swiftshader_path_.empty() &&
- !base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableSoftwareRasterizer))
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
jbauman 2017/02/23 04:30:45 Check BUILDFLAG(ENABLE_SWIFTSHADER) here. Otherwis
sugoi 2017/02/28 16:45:09 Done.
+ switches::kDisableSoftwareRasterizer))
use_swiftshader_ = true;
}
}

Powered by Google App Engine
This is Rietveld 408576698