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

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

Issue 1503223005: Identify the active GPU using GL strings in multiple GPU situation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | gpu/config/gpu_control_list.cc » ('j') | no next file with comments »
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 !gpu_info_.gl_renderer.empty() || 475 !gpu_info_.gl_renderer.empty() ||
476 !gpu_info_.gl_version.empty()) 476 !gpu_info_.gl_version.empty())
477 return; 477 return;
478 478
479 gpu::GPUInfo gpu_info = gpu_info_; 479 gpu::GPUInfo gpu_info = gpu_info_;
480 480
481 gpu_info.gl_vendor = gl_vendor; 481 gpu_info.gl_vendor = gl_vendor;
482 gpu_info.gl_renderer = gl_renderer; 482 gpu_info.gl_renderer = gl_renderer;
483 gpu_info.gl_version = gl_version; 483 gpu_info.gl_version = gl_version;
484 484
485 gpu::IdentifyActiveGPU(&gpu_info);
485 gpu::CollectDriverInfoGL(&gpu_info); 486 gpu::CollectDriverInfoGL(&gpu_info);
486 487
487 UpdateGpuInfo(gpu_info); 488 UpdateGpuInfo(gpu_info);
488 UpdateGpuSwitchingManager(gpu_info); 489 UpdateGpuSwitchingManager(gpu_info);
489 UpdatePreliminaryBlacklistedFeatures(); 490 UpdatePreliminaryBlacklistedFeatures();
490 } 491 }
491 492
492 void GpuDataManagerImplPrivate::GetGLStrings(std::string* gl_vendor, 493 void GpuDataManagerImplPrivate::GetGLStrings(std::string* gl_vendor,
493 std::string* gl_renderer, 494 std::string* gl_renderer,
494 std::string* gl_version) { 495 std::string* gl_version) {
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
1224 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; 1225 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
1225 #if defined(OS_WIN) 1226 #if defined(OS_WIN)
1226 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; 1227 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
1227 #endif 1228 #endif
1228 complete_gpu_info_already_requested_ = true; 1229 complete_gpu_info_already_requested_ = true;
1229 // Some observers might be waiting. 1230 // Some observers might be waiting.
1230 NotifyGpuInfoUpdate(); 1231 NotifyGpuInfoUpdate();
1231 } 1232 }
1232 1233
1233 } // namespace content 1234 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | gpu/config/gpu_control_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698