OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
10 #include "base/memory/scoped_generic_obj.h" | 10 #include "base/memory/scoped_generic_obj.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "third_party/mesa/MesaLib/include/GL/osmesa.h" | 12 #include "third_party/mesa/MesaLib/include/GL/osmesa.h" |
13 #include "ui/gl/gl_bindings.h" | 13 #include "ui/gl/gl_bindings.h" |
14 #include "ui/gl/gl_context_cgl.h" | 14 #include "ui/gl/gl_context_cgl.h" |
15 #include "ui/gl/gl_context_osmesa.h" | 15 #include "ui/gl/gl_context_osmesa.h" |
16 #include "ui/gl/gl_context_stub.h" | 16 #include "ui/gl/gl_context_stub.h" |
17 #include "ui/gl/gl_implementation.h" | 17 #include "ui/gl/gl_implementation.h" |
18 #include "ui/gl/gl_surface.h" | 18 #include "ui/gl/gl_surface.h" |
19 #include "ui/gl/gl_switches.h" | 19 #include "ui/gl/gl_switches.h" |
| 20 #include "ui/gl/gpu_switching_manager.h" |
20 | 21 |
21 #if defined(USE_AURA) | 22 #if defined(USE_AURA) |
22 #include "ui/gl/gl_context_nsview.h" | 23 #include "ui/gl/gl_context_nsview.h" |
23 #endif | 24 #endif |
24 | 25 |
25 namespace { | 26 namespace { |
26 | 27 |
27 // ScopedGenericObj functor for CGLDestroyRendererInfo(). | 28 // ScopedGenericObj functor for CGLDestroyRendererInfo(). |
28 class ScopedDestroyRendererInfo { | 29 class ScopedDestroyRendererInfo { |
29 public: | 30 public: |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 | 164 |
164 const int kMacBookProFirstDualAMDIntelGPUModel = 8; | 165 const int kMacBookProFirstDualAMDIntelGPUModel = 8; |
165 | 166 |
166 bool forcibly_disable = | 167 bool forcibly_disable = |
167 ((model == "MacBookPro") && | 168 ((model == "MacBookPro") && |
168 (model_major < kMacBookProFirstDualAMDIntelGPUModel)) || | 169 (model_major < kMacBookProFirstDualAMDIntelGPUModel)) || |
169 CommandLine::ForCurrentProcess()->HasSwitch( | 170 CommandLine::ForCurrentProcess()->HasSwitch( |
170 switches::kDisableGpuSwitching); | 171 switches::kDisableGpuSwitching); |
171 | 172 |
172 if (forcibly_disable) { | 173 if (forcibly_disable) { |
173 GLContextCGL::ForceUseOfDiscreteGPU(); | 174 GpuSwitchingManager::GetInstance()->ForceUseOfDiscreteGpu(); |
174 return false; | 175 return false; |
175 } | 176 } |
176 | 177 |
177 supports_dual_gpus = true; | 178 supports_dual_gpus = true; |
178 } | 179 } |
179 | 180 |
180 return supports_dual_gpus; | 181 return supports_dual_gpus; |
181 } | 182 } |
182 | 183 |
183 } // namespace gfx | 184 } // namespace gfx |
OLD | NEW |