| 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 "gpu/ipc/service/gpu_channel_manager.h" | 5 #include "gpu/ipc/service/gpu_channel_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/command_line.h" |
| 11 #include "base/location.h" | 12 #include "base/location.h" |
| 12 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 13 #include "base/thread_task_runner_handle.h" | 14 #include "base/thread_task_runner_handle.h" |
| 14 #include "build/build_config.h" | 15 #include "build/build_config.h" |
| 15 #include "gpu/command_buffer/common/sync_token.h" | 16 #include "gpu/command_buffer/common/sync_token.h" |
| 16 #include "gpu/command_buffer/common/value_state.h" | 17 #include "gpu/command_buffer/common/value_state.h" |
| 17 #include "gpu/command_buffer/service/feature_info.h" | 18 #include "gpu/command_buffer/service/feature_info.h" |
| 18 #include "gpu/command_buffer/service/mailbox_manager.h" | 19 #include "gpu/command_buffer/service/mailbox_manager.h" |
| 19 #include "gpu/command_buffer/service/memory_program_cache.h" | 20 #include "gpu/command_buffer/service/memory_program_cache.h" |
| 20 #include "gpu/command_buffer/service/shader_translator_cache.h" | 21 #include "gpu/command_buffer/service/shader_translator_cache.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 45 GpuChannelManagerDelegate* delegate, | 46 GpuChannelManagerDelegate* delegate, |
| 46 GpuWatchdog* watchdog, | 47 GpuWatchdog* watchdog, |
| 47 base::SingleThreadTaskRunner* task_runner, | 48 base::SingleThreadTaskRunner* task_runner, |
| 48 base::SingleThreadTaskRunner* io_task_runner, | 49 base::SingleThreadTaskRunner* io_task_runner, |
| 49 base::WaitableEvent* shutdown_event, | 50 base::WaitableEvent* shutdown_event, |
| 50 SyncPointManager* sync_point_manager, | 51 SyncPointManager* sync_point_manager, |
| 51 GpuMemoryBufferFactory* gpu_memory_buffer_factory) | 52 GpuMemoryBufferFactory* gpu_memory_buffer_factory) |
| 52 : task_runner_(task_runner), | 53 : task_runner_(task_runner), |
| 53 io_task_runner_(io_task_runner), | 54 io_task_runner_(io_task_runner), |
| 54 gpu_preferences_(gpu_preferences), | 55 gpu_preferences_(gpu_preferences), |
| 56 gpu_driver_bug_workarounds_(base::CommandLine::ForCurrentProcess()), |
| 55 delegate_(delegate), | 57 delegate_(delegate), |
| 56 watchdog_(watchdog), | 58 watchdog_(watchdog), |
| 57 shutdown_event_(shutdown_event), | 59 shutdown_event_(shutdown_event), |
| 58 share_group_(new gfx::GLShareGroup), | 60 share_group_(new gfx::GLShareGroup), |
| 59 mailbox_manager_(gles2::MailboxManager::Create(gpu_preferences)), | 61 mailbox_manager_(gles2::MailboxManager::Create(gpu_preferences)), |
| 60 gpu_memory_manager_(this), | 62 gpu_memory_manager_(this), |
| 61 sync_point_manager_(sync_point_manager), | 63 sync_point_manager_(sync_point_manager), |
| 62 sync_point_client_waiter_( | 64 sync_point_client_waiter_( |
| 63 sync_point_manager->CreateSyncPointClientWaiter()), | 65 sync_point_manager->CreateSyncPointClientWaiter()), |
| 64 gpu_memory_buffer_factory_(gpu_memory_buffer_factory), | 66 gpu_memory_buffer_factory_(gpu_memory_buffer_factory), |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 } | 314 } |
| 313 } | 315 } |
| 314 if (!stub || !stub->decoder()->MakeCurrent()) | 316 if (!stub || !stub->decoder()->MakeCurrent()) |
| 315 return; | 317 return; |
| 316 glFinish(); | 318 glFinish(); |
| 317 DidAccessGpu(); | 319 DidAccessGpu(); |
| 318 } | 320 } |
| 319 #endif | 321 #endif |
| 320 | 322 |
| 321 } // namespace gpu | 323 } // namespace gpu |
| OLD | NEW |