| 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/command_line.h" |
| 12 #include "base/location.h" | 12 #include "base/location.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 15 #include "base/single_thread_task_runner.h" | 15 #include "base/single_thread_task_runner.h" |
| 16 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
| 17 #include "build/build_config.h" | 17 #include "build/build_config.h" |
| 18 #include "gpu/command_buffer/common/sync_token.h" | 18 #include "gpu/command_buffer/common/sync_token.h" |
| 19 #include "gpu/command_buffer/service/feature_info.h" | 19 #include "gpu/command_buffer/service/feature_info.h" |
| 20 #include "gpu/command_buffer/service/mailbox_manager.h" | 20 #include "gpu/command_buffer/service/mailbox_manager.h" |
| 21 #include "gpu/command_buffer/service/memory_program_cache.h" | 21 #include "gpu/command_buffer/service/memory_program_cache.h" |
| 22 #include "gpu/command_buffer/service/preemption_flag.h" |
| 22 #include "gpu/command_buffer/service/shader_translator_cache.h" | 23 #include "gpu/command_buffer/service/shader_translator_cache.h" |
| 23 #include "gpu/command_buffer/service/sync_point_manager.h" | 24 #include "gpu/command_buffer/service/sync_point_manager.h" |
| 24 #include "gpu/ipc/common/gpu_messages.h" | 25 #include "gpu/ipc/common/gpu_messages.h" |
| 25 #include "gpu/ipc/service/gpu_channel.h" | 26 #include "gpu/ipc/service/gpu_channel.h" |
| 26 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" | 27 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
| 27 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" | 28 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" |
| 28 #include "gpu/ipc/service/gpu_memory_manager.h" | 29 #include "gpu/ipc/service/gpu_memory_manager.h" |
| 29 #include "ui/gl/gl_bindings.h" | 30 #include "ui/gl/gl_bindings.h" |
| 30 #include "ui/gl/gl_share_group.h" | 31 #include "ui/gl/gl_share_group.h" |
| 31 #include "ui/gl/init/gl_factory.h" | 32 #include "ui/gl/init/gl_factory.h" |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 } | 262 } |
| 262 } | 263 } |
| 263 if (!stub || !stub->decoder()->MakeCurrent()) | 264 if (!stub || !stub->decoder()->MakeCurrent()) |
| 264 return; | 265 return; |
| 265 glFinish(); | 266 glFinish(); |
| 266 DidAccessGpu(); | 267 DidAccessGpu(); |
| 267 } | 268 } |
| 268 #endif | 269 #endif |
| 269 | 270 |
| 270 } // namespace gpu | 271 } // namespace gpu |
| OLD | NEW |